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

Unified Diff: patches/x509_hash_name_algorithm_change.patch

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 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
« no previous file with comments | « patches/snap_start.patch ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/x509_hash_name_algorithm_change.patch
===================================================================
--- patches/x509_hash_name_algorithm_change.patch (revision 0)
+++ patches/x509_hash_name_algorithm_change.patch (revision 0)
@@ -0,0 +1,31 @@
+--- openssl-1.0.0f-origin/crypto/x509/by_dir.c 2012-01-19 02:20:24.821550944 +0800
++++ openssl-1.0.0f/crypto/x509/by_dir.c 2012-01-19 23:36:53.597870429 +0800
+@@ -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);
« no previous file with comments | « patches/snap_start.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698