OLD | NEW |
(Empty) | |
| 1 diff -burN android-openssl.1/openssl.config android-openssl/openssl.config |
| 2 --- android-openssl.1/openssl.config 2013-03-25 11:20:39.208813510 +0100 |
| 3 +++ android-openssl/openssl.config 2013-03-25 11:34:02.687462212 +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.1/patches/x509_hash_name_algorithm_change.patch andro
id-openssl/patches/x509_hash_name_algorithm_change.patch |
| 20 --- android-openssl.1/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-
25 11:32:21.366375000 +0100 |
| 22 @@ -0,0 +1,33 @@ |
| 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-25 11:30:17.775049611 +0
100 |
| 25 ++++ android-openssl/crypto/x509/by_dir.c 2013-03-25 11:31:52.936070192 +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 +@@ -322,7 +324,11 @@ |
| 36 + |
| 37 + ctx=(BY_DIR *)xl->method_data; |
| 38 + |
| 39 +- h=X509_NAME_hash(name); |
| 40 ++ hash_array[0]=X509_NAME_hash(name); |
| 41 ++ hash_array[1]=X509_NAME_hash_old(name); |
| 42 ++ for (hash_index=0; hash_index < 2; ++hash_index) |
| 43 ++ { |
| 44 ++ h=hash_array[hash_index]; |
| 45 + for (i=0; i < sk_BY_DIR_ENTRY_num(ctx->dirs); i++) |
| 46 + { |
| 47 + BY_DIR_ENTRY *ent; |
| 48 +@@ -476,6 +482,7 @@ |
| 49 + goto finish; |
| 50 + } |
| 51 + } |
| 52 ++ } |
| 53 + finish: |
| 54 + if (b != NULL) BUF_MEM_free(b); |
| 55 + return(ok); |
OLD | NEW |