third_party/openssl: add ChaCha20+Poly1305 support.

openssl/ssl/s3_enc.c

 /* ssl/s3_enc.c */
 /* 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 379 matching lines @@
         unsigned char *p;
         const EVP_CIPHER *c;
         const EVP_MD *hash;
         int num;
         int ret = 0;
         SSL_COMP *comp;
 
         if (s->s3->tmp.key_block_length != 0)
                 return(1);
 
-        if (!ssl_cipher_get_evp(s->session,&c,&hash,NULL,NULL,&comp))
+        if (!ssl_cipher_get_comp(s->session, &comp))
                 {
                 SSLerr(SSL_F_SSL3_SETUP_KEY_BLOCK,SSL_R_CIPHER_OR_HASH_UNAVAILABLE);
                 return(0);
+                }
+
+        if (!ssl_cipher_get_evp(s->session,&c,&hash,NULL,NULL))
+                {
+                SSLerr(SSL_F_SSL3_SETUP_KEY_BLOCK,SSL_R_CIPHER_OR_HASH_UNAVAILABLE);
+                return(0);
                 }
 
         s->s3->tmp.new_sym_enc=c;
         s->s3->tmp.new_hash=hash;
 #ifdef OPENSSL_NO_COMP
         s->s3->tmp.new_compression=NULL;
 #else
         s->s3->tmp.new_compression=comp;
 #endif
 
@@ skipping 475 matching lines @@
         case SSL_AD_UNSUPPORTED_EXTENSION: return(SSL3_AD_HANDSHAKE_FAILURE);
         case SSL_AD_CERTIFICATE_UNOBTAINABLE: return(SSL3_AD_HANDSHAKE_FAILURE);
         case SSL_AD_UNRECOGNIZED_NAME:  return(SSL3_AD_HANDSHAKE_FAILURE);
         case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(SSL3_AD_HANDSHAKE_FAILURE);
         case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(SSL3_AD_HANDSHAKE_FAILURE);
         case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY);
         default:                        return(-1);
                 }
         }