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

Side by Side Diff: openssl/crypto/ecdsa/ecs_lib.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/ecdsa/ecs_err.c ('k') | openssl/crypto/ecdsa/ecs_ossl.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/ecdsa/ecs_lib.c */ 1 /* crypto/ecdsa/ecs_lib.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 const ECDSA_METHOD *ECDSA_get_default_method(void) 77 const ECDSA_METHOD *ECDSA_get_default_method(void)
78 { 78 {
79 if(!default_ECDSA_method) 79 if(!default_ECDSA_method)
80 default_ECDSA_method = ECDSA_OpenSSL(); 80 default_ECDSA_method = ECDSA_OpenSSL();
81 return default_ECDSA_method; 81 return default_ECDSA_method;
82 } 82 }
83 83
84 int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth) 84 int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
85 { 85 {
86 const ECDSA_METHOD *mtmp;
87 ECDSA_DATA *ecdsa; 86 ECDSA_DATA *ecdsa;
88 87
89 ecdsa = ecdsa_check(eckey); 88 ecdsa = ecdsa_check(eckey);
90 89
91 if (ecdsa == NULL) 90 if (ecdsa == NULL)
92 return 0; 91 return 0;
93 92
94 mtmp = ecdsa->meth;
95 #ifndef OPENSSL_NO_ENGINE 93 #ifndef OPENSSL_NO_ENGINE
96 if (ecdsa->engine) 94 if (ecdsa->engine)
97 { 95 {
98 ENGINE_finish(ecdsa->engine); 96 ENGINE_finish(ecdsa->engine);
99 ecdsa->engine = NULL; 97 ecdsa->engine = NULL;
100 } 98 }
101 #endif 99 #endif
102 ecdsa->meth = meth; 100 ecdsa->meth = meth;
103 101
104 return 1; 102 return 1;
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 } 250 }
253 251
254 void *ECDSA_get_ex_data(EC_KEY *d, int idx) 252 void *ECDSA_get_ex_data(EC_KEY *d, int idx)
255 { 253 {
256 ECDSA_DATA *ecdsa; 254 ECDSA_DATA *ecdsa;
257 ecdsa = ecdsa_check(d); 255 ecdsa = ecdsa_check(d);
258 if (ecdsa == NULL) 256 if (ecdsa == NULL)
259 return NULL; 257 return NULL;
260 return(CRYPTO_get_ex_data(&ecdsa->ex_data,idx)); 258 return(CRYPTO_get_ex_data(&ecdsa->ex_data,idx));
261 } 259 }
OLDNEW
« no previous file with comments | « openssl/crypto/ecdsa/ecs_err.c ('k') | openssl/crypto/ecdsa/ecs_ossl.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698