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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 diff -burN android-openssl.orig/openssl.config android-openssl/openssl.config
2 --- android-openssl.orig/openssl.config 2013-03-21 16:52:00.188298572 +0100
3 +++ android-openssl/openssl.config 2013-03-21 16:54:12.989702713 +0100
4 @@ -992,6 +992,7 @@
5 channelid.patch \
6 eng_dyn_dirs.patch \
7 fix_clang_build.patch \
8 +x509_hash_name_algorithm_change.patch \
9 "
10
11 OPENSSL_PATCHES_progs_SOURCES="\
12 @@ -1048,3 +1049,6 @@
13 crypto/x509v3/v3_utl.c \
14 "
15
16 +OPENSSL_PATCHES_x509_hash_name_algorithm_change_SOURCES="\
17 +crypto/x509/by_dir.c \
18 +"
19 diff -burN android-openssl.orig/patches/x509_hash_name_algorithm_change.patch an droid-openssl/patches/x509_hash_name_algorithm_change.patch
20 --- android-openssl.orig/patches/x509_hash_name_algorithm_change.patch 1970-01- 01 01:00:00.000000000 +0100
21 +++ android-openssl/patches/x509_hash_name_algorithm_change.patch 2013-03- 21 16:52:50.708832715 +0100
22 @@ -0,0 +1,32 @@
23 +diff -burN android-openssl.orig/crypto/x509/by_dir.c android-openssl/crypto/x50 9/by_dir.c
24 +--- android-openssl.orig/crypto/x509/by_dir.c 2013-03-21 16:48:31.546092948 +0 100
25 ++++ android-openssl/crypto/x509/by_dir.c 2013-03-21 16:48:44.916234272 +0 100
26 +@@ -287,6 +287,8 @@
27 + int ok=0;
28 + int i,j,k;
29 + unsigned long h;
30 ++ unsigned long hash_array[2];
31 ++ int hash_index;
32 + BUF_MEM *b=NULL;
33 + X509_OBJECT stmp,*tmp;
34 + const char *postfix="";
35 +@@ -323,6 +325,11 @@
36 + ctx=(BY_DIR *)xl->method_data;
37 +
38 + h=X509_NAME_hash(name);
39 ++ hash_array[0]=h;
40 ++ hash_array[1]=X509_NAME_hash_old(name);
41 ++ for (hash_index=0; hash_index < 2; hash_index++)
42 ++ {
43 ++ h=hash_array[hash_index];
44 + for (i=0; i < sk_BY_DIR_ENTRY_num(ctx->dirs); i++)
45 + {
46 + BY_DIR_ENTRY *ent;
47 +@@ -476,6 +483,7 @@
48 + goto finish;
49 + }
50 + }
51 ++ }
52 + finish:
53 + if (b != NULL) BUF_MEM_free(b);
54 + return(ok);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698