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

Side by Side Diff: openssl/ssl/s2_clnt.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/patches/use_aead_for_aes_gcm.patch ('k') | openssl/ssl/s2_enc.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 /* ssl/s2_clnt.c */ 1 /* ssl/s2_clnt.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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 unsigned char *p,*d; 616 unsigned char *p,*d;
617 int clear,enc,karg,i; 617 int clear,enc,karg,i;
618 SSL_SESSION *sess; 618 SSL_SESSION *sess;
619 const EVP_CIPHER *c; 619 const EVP_CIPHER *c;
620 const EVP_MD *md; 620 const EVP_MD *md;
621 621
622 buf=(unsigned char *)s->init_buf->data; 622 buf=(unsigned char *)s->init_buf->data;
623 if (s->state == SSL2_ST_SEND_CLIENT_MASTER_KEY_A) 623 if (s->state == SSL2_ST_SEND_CLIENT_MASTER_KEY_A)
624 { 624 {
625 625
626 » » if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL)) 626 » » if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL))
627 { 627 {
628 ssl2_return_error(s,SSL2_PE_NO_CIPHER); 628 ssl2_return_error(s,SSL2_PE_NO_CIPHER);
629 SSLerr(SSL_F_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CI PHER_FUNCTIONS); 629 SSLerr(SSL_F_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CI PHER_FUNCTIONS);
630 return(-1); 630 return(-1);
631 } 631 }
632 sess=s->session; 632 sess=s->session;
633 p=buf; 633 p=buf;
634 d=p+10; 634 d=p+10;
635 *(p++)=SSL2_MT_CLIENT_MASTER_KEY;/* type */ 635 *(p++)=SSL2_MT_CLIENT_MASTER_KEY;/* type */
636 636
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
1118 EVP_PKEY_free(pkey); 1118 EVP_PKEY_free(pkey);
1119 return(i); 1119 return(i);
1120 } 1120 }
1121 #else /* !OPENSSL_NO_SSL2 */ 1121 #else /* !OPENSSL_NO_SSL2 */
1122 1122
1123 # if PEDANTIC 1123 # if PEDANTIC
1124 static void *dummy=&dummy; 1124 static void *dummy=&dummy;
1125 # endif 1125 # endif
1126 1126
1127 #endif 1127 #endif
OLDNEW
« no previous file with comments | « openssl/patches/use_aead_for_aes_gcm.patch ('k') | openssl/ssl/s2_enc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698