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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/evp/e_null.c ('k') | openssl/crypto/evp/e_rc4.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/evp/e_rc2.c */ 1 /* crypto/evp/e_rc2.c */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 *(int *)ptr = data(c)->key_bits; 216 *(int *)ptr = data(c)->key_bits;
217 return 1; 217 return 1;
218 218
219 case EVP_CTRL_SET_RC2_KEY_BITS: 219 case EVP_CTRL_SET_RC2_KEY_BITS:
220 if(arg > 0) 220 if(arg > 0)
221 { 221 {
222 data(c)->key_bits = arg; 222 data(c)->key_bits = arg;
223 return 1; 223 return 1;
224 } 224 }
225 return 0; 225 return 0;
226 #ifdef PBE_PRF_TEST
227 case EVP_CTRL_PBE_PRF_NID:
228 *(int *)ptr = NID_hmacWithMD5;
229 return 1;
230 #endif
226 231
227 default: 232 default:
228 return -1; 233 return -1;
229 } 234 }
230 } 235 }
231 236
232 #endif 237 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/evp/e_null.c ('k') | openssl/crypto/evp/e_rc4.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698