third_party/openssl: add ChaCha20+Poly1305 support.

openssl/include/openssl/ssl.h

 /* ssl/ssl.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 273 matching lines @@
 #define SSL_TXT_RC2             "RC2"
 #define SSL_TXT_IDEA            "IDEA"
 #define SSL_TXT_SEED            "SEED"
 #define SSL_TXT_AES128          "AES128"
 #define SSL_TXT_AES256          "AES256"
 #define SSL_TXT_AES             "AES"
 #define SSL_TXT_AES_GCM         "AESGCM"
 #define SSL_TXT_CAMELLIA128     "CAMELLIA128"
 #define SSL_TXT_CAMELLIA256     "CAMELLIA256"
 #define SSL_TXT_CAMELLIA        "CAMELLIA"
+#define SSL_TXT_CHACHA20        "CHACHA20"
 
 #define SSL_TXT_MD5             "MD5"
 #define SSL_TXT_SHA1            "SHA1"
 #define SSL_TXT_SHA             "SHA" /* same as "SHA1" */
 #define SSL_TXT_GOST94          "GOST94" 
 #define SSL_TXT_GOST89MAC               "GOST89MAC" 
 #define SSL_TXT_SHA256          "SHA256"
 #define SSL_TXT_SHA384          "SHA384"
 
 #define SSL_TXT_SSLV2           "SSLv2"
@@ skipping 88 matching lines @@
         unsigned long id;               /* id, 4 bytes, first is version */
 
         /* changed in 0.9.9: these four used to be portions of a single value 'algorithms' */
         unsigned long algorithm_mkey;   /* key exchange algorithm */
         unsigned long algorithm_auth;   /* server authentication */
         unsigned long algorithm_enc;    /* symmetric encryption */
         unsigned long algorithm_mac;    /* symmetric authentication */
         unsigned long algorithm_ssl;    /* (major) protocol version */
 
         unsigned long algo_strength;    /* strength and export flags */
-        unsigned long algorithm2;       /* Extra flags */
+        unsigned long algorithm2;       /* Extra flags. See SSL2_CF_* in ssl2.h
+                                           and algorithm2 section in
+                                           ssl_locl.h */
         int strength_bits;              /* Number of bits really used */
         int alg_bits;                   /* Number of bits for algorithm */
         };
 
 
 /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
 struct ssl_method_st
         {
         int version;
         int (*ssl_new)(SSL *s);
@@ skipping 308 matching lines @@
 int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
 int SSL_SRP_CTX_free(SSL *ctx);
 int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
 int SSL_srp_server_param_with_username(SSL *s, int *ad);
 int SRP_generate_server_master_secret(SSL *s,unsigned char *master_key);
 int SRP_Calc_A_param(SSL *s);
 int SRP_generate_client_master_secret(SSL *s,unsigned char *master_key);
 
 #endif
 
+struct ssl_aead_ctx_st;
+typedef struct ssl_aead_ctx_st SSL_AEAD_CTX;
+
 #if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
 #define SSL_MAX_CERT_LIST_DEFAULT 1024*30 /* 30k max cert list :-) */
 #else
 #define SSL_MAX_CERT_LIST_DEFAULT 1024*100 /* 100k max cert list :-) */
 #endif
 
 #define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)
 
 /* This callback type is used inside SSL_CTX, SSL, and in the functions that set
  * them. It is used to override the generation of SSL/TLS session IDs in a
@@ skipping 465 matching lines @@
         int trust;              /* Trust setting */
 #endif
 
         /* crypto */
         STACK_OF(SSL_CIPHER) *cipher_list;
         STACK_OF(SSL_CIPHER) *cipher_list_by_id;
 
         /* These are the ones being used, the ones in SSL_SESSION are
          * the ones to be 'copied' into these ones */
         int mac_flags; 
+        SSL_AEAD_CTX *aead_read_ctx;    /* AEAD context. If non-NULL, then
+                                           |enc_read_ctx| and |read_hash| are
+                                           ignored. */
         EVP_CIPHER_CTX *enc_read_ctx;           /* cryptographic state */
         EVP_MD_CTX *read_hash;          /* used for mac generation */
 #ifndef OPENSSL_NO_COMP
         COMP_CTX *expand;                       /* uncompress */
 #else
         char *expand;
 #endif
 
+        SSL_AEAD_CTX *aead_write_ctx;   /* AEAD context. If non-NULL, then
+                                           |enc_write_ctx| and |write_hash| are
+                                           ignored. */
         EVP_CIPHER_CTX *enc_write_ctx;          /* cryptographic state */
         EVP_MD_CTX *write_hash;         /* used for mac generation */
 #ifndef OPENSSL_NO_COMP
         COMP_CTX *compress;                     /* compression */
 #else
         char *compress; 
 #endif
 
         /* session info */
 
@@ skipping 1086 matching lines @@
 #define SSL_F_SSL_USE_CERTIFICATE_FILE                   200
 #define SSL_F_SSL_USE_PRIVATEKEY                         201
 #define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    202
 #define SSL_F_SSL_USE_PRIVATEKEY_FILE                    203
 #define SSL_F_SSL_USE_PSK_IDENTITY_HINT                  273
 #define SSL_F_SSL_USE_RSAPRIVATEKEY                      204
 #define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 205
 #define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 206
 #define SSL_F_SSL_VERIFY_CERT_CHAIN                      207
 #define SSL_F_SSL_WRITE                                  208
+#define SSL_F_TLS1_AEAD_CTX_INIT                         339
 #define SSL_F_TLS1_CERT_VERIFY_MAC                       286
 #define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209
+#define SSL_F_TLS1_CHANGE_CIPHER_STATE_AEAD              340
+#define SSL_F_TLS1_CHANGE_CIPHER_STATE_CIPHER            338
 #define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT              274
 #define SSL_F_TLS1_ENC                                   210
 #define SSL_F_TLS1_EXPORT_KEYING_MATERIAL                314
 #define SSL_F_TLS1_HEARTBEAT                             315
 #define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT            275
 #define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT            276
 #define SSL_F_TLS1_PRF                                   284
 #define SSL_F_TLS1_SETUP_KEY_BLOCK                       211
 #define SSL_F_WRITE_PENDING                              212
 
@@ skipping 305 matching lines @@
 #define SSL_R_WRONG_SIGNATURE_TYPE                       370
 #define SSL_R_WRONG_SSL_VERSION                          266
 #define SSL_R_WRONG_VERSION_NUMBER                       267
 #define SSL_R_X509_LIB                                   268
 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
 
 #ifdef  __cplusplus
 }
 #endif
 #endif