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

Side by Side Diff: openssl/ssl/ssl3.h

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.h ('k') | openssl/ssl/ssl_ciph.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/ssl3.h */ 1 /* ssl/ssl3.h */
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 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 int ctype_num; 510 int ctype_num;
511 char ctype[SSL3_CT_NUMBER]; 511 char ctype[SSL3_CT_NUMBER];
512 STACK_OF(X509_NAME) *ca_names; 512 STACK_OF(X509_NAME) *ca_names;
513 513
514 int use_rsa_tmp; 514 int use_rsa_tmp;
515 515
516 int key_block_length; 516 int key_block_length;
517 unsigned char *key_block; 517 unsigned char *key_block;
518 518
519 const EVP_CIPHER *new_sym_enc; 519 const EVP_CIPHER *new_sym_enc;
520 const EVP_AEAD *new_aead;
520 const EVP_MD *new_hash; 521 const EVP_MD *new_hash;
521 int new_mac_pkey_type; 522 int new_mac_pkey_type;
522 int new_mac_secret_size; 523 int new_mac_secret_size;
523 #ifndef OPENSSL_NO_COMP 524 #ifndef OPENSSL_NO_COMP
524 const SSL_COMP *new_compression; 525 const SSL_COMP *new_compression;
525 #else 526 #else
526 char *new_compression; 527 char *new_compression;
527 #endif 528 #endif
528 int cert_request; 529 int cert_request;
529 } tmp; 530 } tmp;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) 694 #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)
694 #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) 695 #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ)
695 #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) 696 #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ)
696 #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) 697 #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
697 698
698 #ifdef __cplusplus 699 #ifdef __cplusplus
699 } 700 }
700 #endif 701 #endif
701 #endif 702 #endif
702 703
OLDNEW
« no previous file with comments | « openssl/ssl/ssl.h ('k') | openssl/ssl/ssl_ciph.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698