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

Side by Side Diff: openssl/crypto/engine/eng_list.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/engine/eng_lib.c ('k') | openssl/crypto/engine/eng_openssl.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/engine/eng_list.c */ 1 /* crypto/engine/eng_list.c */
2 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL 2 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
5 /* ==================================================================== 5 /* ====================================================================
6 * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. 6 * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 #ifndef OPENSSL_NO_ECDH 329 #ifndef OPENSSL_NO_ECDH
330 dest->ecdh_meth = src->ecdh_meth; 330 dest->ecdh_meth = src->ecdh_meth;
331 #endif 331 #endif
332 #ifndef OPENSSL_NO_ECDSA 332 #ifndef OPENSSL_NO_ECDSA
333 dest->ecdsa_meth = src->ecdsa_meth; 333 dest->ecdsa_meth = src->ecdsa_meth;
334 #endif 334 #endif
335 dest->rand_meth = src->rand_meth; 335 dest->rand_meth = src->rand_meth;
336 dest->store_meth = src->store_meth; 336 dest->store_meth = src->store_meth;
337 dest->ciphers = src->ciphers; 337 dest->ciphers = src->ciphers;
338 dest->digests = src->digests; 338 dest->digests = src->digests;
339 dest->pkey_meths = src->pkey_meths;
339 dest->destroy = src->destroy; 340 dest->destroy = src->destroy;
340 dest->init = src->init; 341 dest->init = src->init;
341 dest->finish = src->finish; 342 dest->finish = src->finish;
342 dest->ctrl = src->ctrl; 343 dest->ctrl = src->ctrl;
343 dest->load_privkey = src->load_privkey; 344 dest->load_privkey = src->load_privkey;
344 dest->load_pubkey = src->load_pubkey; 345 dest->load_pubkey = src->load_pubkey;
345 dest->cmd_defns = src->cmd_defns; 346 dest->cmd_defns = src->cmd_defns;
346 dest->flags = src->flags; 347 dest->flags = src->flags;
347 } 348 }
348 349
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 int ENGINE_up_ref(ENGINE *e) 424 int ENGINE_up_ref(ENGINE *e)
424 { 425 {
425 if (e == NULL) 426 if (e == NULL)
426 { 427 {
427 ENGINEerr(ENGINE_F_ENGINE_UP_REF,ERR_R_PASSED_NULL_PARAMETER); 428 ENGINEerr(ENGINE_F_ENGINE_UP_REF,ERR_R_PASSED_NULL_PARAMETER);
428 return 0; 429 return 0;
429 } 430 }
430 CRYPTO_add(&e->struct_ref,1,CRYPTO_LOCK_ENGINE); 431 CRYPTO_add(&e->struct_ref,1,CRYPTO_LOCK_ENGINE);
431 return 1; 432 return 1;
432 } 433 }
OLDNEW
« no previous file with comments | « openssl/crypto/engine/eng_lib.c ('k') | openssl/crypto/engine/eng_openssl.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698