import OpenSSL 1.0.0e

1 files changed, 31 insertions, 10 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 92f73b6681..c3b5ff33ff 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -768,9 +768,7 @@ int ssl3_check_client_hello(SSL *s)
         if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
                 {
                 /* Throw away what we have done so far in the current handshake,
-                 * which will now be aborted. (A full SSL_clear would be too much.)
-                 * I hope that tmp.dh is the only thing that may need to be cleared
-                 * when a handshake is not completed ... */
+                 * which will now be aborted. (A full SSL_clear would be too much.) */
 #ifndef OPENSSL_NO_DH
                 if (s->s3->tmp.dh != NULL)
                         {
@@ -778,6 +776,13 @@ int ssl3_check_client_hello(SSL *s)
                         s->s3->tmp.dh = NULL;
                         }
 #endif
+#ifndef OPENSSL_NO_ECDH
+                if (s->s3->tmp.ecdh != NULL)
+                        {
+                        EC_KEY_free(s->s3->tmp.ecdh);
+                        s->s3->tmp.ecdh = NULL;
+                        }
+#endif
                 return 2;
                 }
         return 1;
@@ -985,6 +990,10 @@ int ssl3_get_client_hello(SSL *s)
                                 break;
                                 }
                         }
+/* Disabled because it can be used in a ciphersuite downgrade
+ * attack: CVE-2010-4180.
+ */
+#if 0
                 if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
                         {
                         /* Special case as client bug workaround: the previously used cipher may
@@ -999,6 +1008,7 @@ int ssl3_get_client_hello(SSL *s)
                                 j = 1;
                                 }
                         }
+#endif
                 if (j == 0)
                         {
                         /* we need to have the cipher in the cipher
@@ -1486,7 +1496,6 @@ int ssl3_send_server_key_exchange(SSL *s)
 
                         if (s->s3->tmp.dh != NULL)
                                 {
-                                DH_free(dh);
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
                                 }
@@ -1547,7 +1556,6 @@ int ssl3_send_server_key_exchange(SSL *s)
 
                         if (s->s3->tmp.ecdh != NULL)
                                 {
-                                EC_KEY_free(s->s3->tmp.ecdh); 
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
                                 }
@@ -1558,12 +1566,11 @@ int ssl3_send_server_key_exchange(SSL *s)
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
                                 goto err;
                                 }
-                        if (!EC_KEY_up_ref(ecdhp))
+                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
                                 {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
                                 goto err;
                                 }
-                        ecdh = ecdhp;
 
                         s->s3->tmp.ecdh=ecdh;
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
@@ -1726,6 +1733,7 @@ int ssl3_send_server_key_exchange(SSL *s)
                             (unsigned char *)encodedPoint, 
                             encodedlen);
                         OPENSSL_free(encodedPoint);
+                        encodedPoint = NULL;
                         p += encodedlen;
                         }
 #endif
@@ -2435,6 +2443,12 @@ int ssl3_get_client_key_exchange(SSL *s)
                         /* Get encoded point length */
                         i = *p; 
                         p += 1;
+                        if (n != 1 + i)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                    ERR_R_EC_LIB);
+                                goto err;
+                                }
                         if (EC_POINT_oct2point(group, 
                             clnt_ecpoint, p, i, bn_ctx) == 0)
                                 {
@@ -2579,12 +2593,19 @@ int ssl3_get_client_key_exchange(SSL *s)
                         {
                         int ret = 0;
                         EVP_PKEY_CTX *pkey_ctx;
-                        EVP_PKEY *client_pub_pkey = NULL;
+                        EVP_PKEY *client_pub_pkey = NULL, *pk = NULL;
                         unsigned char premaster_secret[32], *start;
-                        size_t outlen=32, inlen;                        
+                        size_t outlen=32, inlen;
+                        unsigned long alg_a;
 
                         /* Get our certificate private key*/
-                        pkey_ctx = EVP_PKEY_CTX_new(s->cert->key->privatekey,NULL);     
+                        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
+                        if (alg_a & SSL_aGOST94)
+                                pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey;
+                        else if (alg_a & SSL_aGOST01)
+                                pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
+
+                        pkey_ctx = EVP_PKEY_CTX_new(pk,NULL);
                         EVP_PKEY_decrypt_init(pkey_ctx);
                         /* If client certificate is present and is of the same type, maybe
                          * use it for key exchange.  Don't mind errors from