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

Side by Side Diff: openssl/crypto/dh/dh_gen.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/dh/dh_err.c ('k') | openssl/crypto/dh/dh_key.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/dh/dh_gen.c */ 1 /* crypto/dh/dh_gen.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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 /* NB: These functions have been upgraded - the previous prototypes are in 59 /* NB: These functions have been upgraded - the previous prototypes are in
60 * dh_depr.c as wrappers to these ones. 60 * dh_depr.c as wrappers to these ones.
61 * - Geoff 61 * - Geoff
62 */ 62 */
63 63
64 #include <stdio.h> 64 #include <stdio.h>
65 #include "cryptlib.h" 65 #include "cryptlib.h"
66 #include <openssl/bn.h> 66 #include <openssl/bn.h>
67 #include <openssl/dh.h> 67 #include <openssl/dh.h>
68 68
69 #ifndef OPENSSL_FIPS
70
71 static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb); 69 static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb);
72 70
73 int DH_generate_parameters_ex(DH *ret, int prime_len, int generator, BN_GENCB *c b) 71 int DH_generate_parameters_ex(DH *ret, int prime_len, int generator, BN_GENCB *c b)
74 { 72 {
75 if(ret->meth->generate_params) 73 if(ret->meth->generate_params)
76 return ret->meth->generate_params(ret, prime_len, generator, cb) ; 74 return ret->meth->generate_params(ret, prime_len, generator, cb) ;
77 return dh_builtin_genparams(ret, prime_len, generator, cb); 75 return dh_builtin_genparams(ret, prime_len, generator, cb);
78 } 76 }
79 77
80 /* We generate DH parameters as follows 78 /* We generate DH parameters as follows
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 ok=0; 166 ok=0;
169 } 167 }
170 168
171 if (ctx != NULL) 169 if (ctx != NULL)
172 { 170 {
173 BN_CTX_end(ctx); 171 BN_CTX_end(ctx);
174 BN_CTX_free(ctx); 172 BN_CTX_free(ctx);
175 } 173 }
176 return ok; 174 return ok;
177 } 175 }
178
179 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/dh/dh_err.c ('k') | openssl/crypto/dh/dh_key.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698