Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: patches.chromium/x509_hash_name_algorithm_change.patch

Issue 12459028: Restore the x509_hash_name_alpgorithm_change patch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/openssl/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: patches.chromium/x509_hash_name_algorithm_change.patch
===================================================================
--- patches.chromium/x509_hash_name_algorithm_change.patch (revision 0)
+++ patches.chromium/x509_hash_name_algorithm_change.patch (revision 0)
@@ -0,0 +1,54 @@
+diff -burN android-openssl.orig/openssl.config android-openssl/openssl.config
+--- android-openssl.orig/openssl.config 2013-03-21 16:52:00.188298572 +0100
++++ android-openssl/openssl.config 2013-03-21 16:54:12.989702713 +0100
+@@ -992,6 +992,7 @@
+ channelid.patch \
+ eng_dyn_dirs.patch \
+ fix_clang_build.patch \
++x509_hash_name_algorithm_change.patch \
+ "
+
+ OPENSSL_PATCHES_progs_SOURCES="\
+@@ -1048,3 +1049,6 @@
+ crypto/x509v3/v3_utl.c \
+ "
+
++OPENSSL_PATCHES_x509_hash_name_algorithm_change_SOURCES="\
++crypto/x509/by_dir.c \
++"
+diff -burN android-openssl.orig/patches/x509_hash_name_algorithm_change.patch android-openssl/patches/x509_hash_name_algorithm_change.patch
+--- android-openssl.orig/patches/x509_hash_name_algorithm_change.patch 1970-01-01 01:00:00.000000000 +0100
++++ android-openssl/patches/x509_hash_name_algorithm_change.patch 2013-03-21 16:52:50.708832715 +0100
+@@ -0,0 +1,32 @@
++diff -burN android-openssl.orig/crypto/x509/by_dir.c android-openssl/crypto/x509/by_dir.c
++--- android-openssl.orig/crypto/x509/by_dir.c 2013-03-21 16:48:31.546092948 +0100
+++++ android-openssl/crypto/x509/by_dir.c 2013-03-21 16:48:44.916234272 +0100
++@@ -287,6 +287,8 @@
++ int ok=0;
++ int i,j,k;
++ unsigned long h;
+++ unsigned long hash_array[2];
+++ int hash_index;
++ BUF_MEM *b=NULL;
++ X509_OBJECT stmp,*tmp;
++ const char *postfix="";
++@@ -323,6 +325,11 @@
++ ctx=(BY_DIR *)xl->method_data;
++
++ h=X509_NAME_hash(name);
+++ hash_array[0]=h;
+++ hash_array[1]=X509_NAME_hash_old(name);
+++ for (hash_index=0; hash_index < 2; hash_index++)
+++ {
+++ h=hash_array[hash_index];
++ for (i=0; i < sk_BY_DIR_ENTRY_num(ctx->dirs); i++)
++ {
++ BY_DIR_ENTRY *ent;
++@@ -476,6 +483,7 @@
++ goto finish;
++ }
++ }
+++ }
++ finish:
++ if (b != NULL) BUF_MEM_free(b);
++ return(ok);

Powered by Google App Engine
This is Rietveld 408576698