third_party/openssl: add ChaCha20+Poly1305 support.

openssl/ssl/s2_srvr.c

 /* ssl/s2_srvr.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 434 matching lines @@
                 ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
                 SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_NO_PRIVATEKEY);
                 return(-1);
                 }
         i=ssl_rsa_private_decrypt(s->cert,s->s2->tmp.enc,
                 &(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]),
                 (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING);
 
         is_export=SSL_C_IS_EXPORT(s->session->cipher);
         
-        if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL))
+        if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL))
                 {
                 ssl2_return_error(s,SSL2_PE_NO_CIPHER);
                 SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
                 return(0);
                 }
 
         if (s->session->cipher->algorithm2 & SSL2_CF_8_BYTE_ENC)
                 {
                 is_export=1;
                 ek=8;
@@ skipping 673 matching lines @@
                 SSLerr(SSL_F_SSL_RSA_PRIVATE_DECRYPT,ERR_R_RSA_LIB);
         return(i);
         }
 #else /* !OPENSSL_NO_SSL2 */
 
 # if PEDANTIC
 static void *dummy=&dummy;
 # endif
 
 #endif