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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: openssl/crypto/evp/e_rc2.c

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
« openssl.gyp ('K') | « openssl/crypto/evp/e_null.c ('k') | openssl/crypto/evp/e_rc4.c » ('j') | patches/x509_hash_name_algorithm_change.patch » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: openssl/crypto/evp/e_rc2.c
===================================================================
--- openssl/crypto/evp/e_rc2.c (revision 105093)
+++ openssl/crypto/evp/e_rc2.c (working copy)
@@ -223,6 +223,11 @@
return 1;
}
return 0;
+#ifdef PBE_PRF_TEST
+ case EVP_CTRL_PBE_PRF_NID:
+ *(int *)ptr = NID_hmacWithMD5;
+ return 1;
+#endif
default:
return -1;
« openssl.gyp ('K') | « openssl/crypto/evp/e_null.c ('k') | openssl/crypto/evp/e_rc4.c » ('j') | patches/x509_hash_name_algorithm_change.patch » ('J')

Powered by Google App Engine
This is Rietveld 408576698