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

Side by Side Diff: openssl/ssl/ssl_lib.c

Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support. Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « openssl/ssl/ssl_err.c ('k') | openssl/ssl/ssl_locl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /*! \file ssl/ssl_lib.c 1 /*! \file ssl/ssl_lib.c
2 * \brief Version independent SSL functions. 2 * \brief Version independent SSL functions.
3 */ 3 */
4 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 4 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This package is an SSL implementation written 7 * This package is an SSL implementation written
8 * by Eric Young (eay@cryptsoft.com). 8 * by Eric Young (eay@cryptsoft.com).
9 * The implementation was written so as to conform with Netscapes SSL. 9 * The implementation was written so as to conform with Netscapes SSL.
10 * 10 *
(...skipping 2818 matching lines...) Expand 10 before | Expand all | Expand 10 after
2829 EVP_CIPHER_CTX_cleanup(s->enc_read_ctx); 2829 EVP_CIPHER_CTX_cleanup(s->enc_read_ctx);
2830 OPENSSL_free(s->enc_read_ctx); 2830 OPENSSL_free(s->enc_read_ctx);
2831 s->enc_read_ctx=NULL; 2831 s->enc_read_ctx=NULL;
2832 } 2832 }
2833 if (s->enc_write_ctx != NULL) 2833 if (s->enc_write_ctx != NULL)
2834 { 2834 {
2835 EVP_CIPHER_CTX_cleanup(s->enc_write_ctx); 2835 EVP_CIPHER_CTX_cleanup(s->enc_write_ctx);
2836 OPENSSL_free(s->enc_write_ctx); 2836 OPENSSL_free(s->enc_write_ctx);
2837 s->enc_write_ctx=NULL; 2837 s->enc_write_ctx=NULL;
2838 } 2838 }
2839 if (s->aead_read_ctx != NULL)
2840 {
2841 EVP_AEAD_CTX_cleanup(&s->aead_read_ctx->ctx);
2842 OPENSSL_free(s->aead_read_ctx);
2843 s->aead_read_ctx = NULL;
2844 }
2845 if (s->aead_write_ctx != NULL)
2846 {
2847 EVP_AEAD_CTX_cleanup(&s->aead_write_ctx->ctx);
2848 OPENSSL_free(s->aead_write_ctx);
2849 s->aead_write_ctx = NULL;
2850 }
2839 #ifndef OPENSSL_NO_COMP 2851 #ifndef OPENSSL_NO_COMP
2840 if (s->expand != NULL) 2852 if (s->expand != NULL)
2841 { 2853 {
2842 COMP_CTX_free(s->expand); 2854 COMP_CTX_free(s->expand);
2843 s->expand=NULL; 2855 s->expand=NULL;
2844 } 2856 }
2845 if (s->compress != NULL) 2857 if (s->compress != NULL)
2846 { 2858 {
2847 COMP_CTX_free(s->compress); 2859 COMP_CTX_free(s->compress);
2848 s->compress=NULL; 2860 s->compress=NULL;
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
3330 } 3342 }
3331 3343
3332 #if defined(_WINDLL) && defined(OPENSSL_SYS_WIN16) 3344 #if defined(_WINDLL) && defined(OPENSSL_SYS_WIN16)
3333 #include "../crypto/bio/bss_file.c" 3345 #include "../crypto/bio/bss_file.c"
3334 #endif 3346 #endif
3335 3347
3336 IMPLEMENT_STACK_OF(SSL_CIPHER) 3348 IMPLEMENT_STACK_OF(SSL_CIPHER)
3337 IMPLEMENT_STACK_OF(SSL_COMP) 3349 IMPLEMENT_STACK_OF(SSL_COMP)
3338 IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, 3350 IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER,
3339 ssl_cipher_id); 3351 ssl_cipher_id);
OLDNEW
« no previous file with comments | « openssl/ssl/ssl_err.c ('k') | openssl/ssl/ssl_locl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698