Client side compression algorithm sanity checks: ensure old compression

[openssl.git] / ssl / s3_enc.c

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 7049be2c662ebb809e41f8b70ffa40e77fdb6fe5..3d7aec97a2028fea35fb8aa4bae6ae3c63a26ccd 100644 (file)
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -231,6 +231,8 @@ int ssl3_change_cipher_state(SSL *s, int which)
        is_exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
        c=s->s3->tmp.new_sym_enc;
        m=s->s3->tmp.new_hash;
+       /* m == NULL will lead to a crash later */
+       OPENSSL_assert(m);
 #ifndef OPENSSL_NO_COMP
        if (s->s3->tmp.new_compression == NULL)
                comp=NULL;
@@ -313,6 +315,8 @@ int ssl3_change_cipher_state(SSL *s, int which)
 
        p=s->s3->tmp.key_block;
        i=EVP_MD_size(m);
+       if (i < 0)
+               goto err2;
        cl=EVP_CIPHER_key_length(c);
        j=is_exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?
                 cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;
@@ -407,7 +411,11 @@ int ssl3_setup_key_block(SSL *s)
        s->s3->tmp.new_compression=comp;
 #endif
 
-       num=EVP_CIPHER_key_length(c)+EVP_MD_size(hash)+EVP_CIPHER_iv_length(c);
+       num=EVP_MD_size(hash);
+       if (num < 0)
+               return 0;
+
+       num=EVP_CIPHER_key_length(c)+num+EVP_CIPHER_iv_length(c);
        num*=2;
 
        ssl3_cleanup_key_block(s);
@@ -546,7 +554,7 @@ void ssl3_init_finished_mac(SSL *s)
        if (s->s3->handshake_buffer) BIO_free(s->s3->handshake_buffer);
        if (s->s3->handshake_dgst) ssl3_free_digest_list(s);
     s->s3->handshake_buffer=BIO_new(BIO_s_mem());      
-       BIO_set_close(s->s3->handshake_buffer,BIO_CLOSE);
+       (void)BIO_set_close(s->s3->handshake_buffer,BIO_CLOSE);
        }
 
 void ssl3_free_digest_list(SSL *s) 
@@ -580,37 +588,47 @@ void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len)
                        }
                }       
        }
-void ssl3_digest_cached_records(SSL *s)
+
+int ssl3_digest_cached_records(SSL *s)
        {
-               int i;
-               long mask;
-               const EVP_MD *md;
-               long hdatalen;
-               void *hdata;
-               /* Allocate handshake_dgst array */
-               ssl3_free_digest_list(s);
-               s->s3->handshake_dgst = OPENSSL_malloc(SSL_MAX_DIGEST * sizeof(EVP_MD_CTX *));
-               memset(s->s3->handshake_dgst,0,SSL_MAX_DIGEST *sizeof(EVP_MD_CTX *));
-               hdatalen = BIO_get_mem_data(s->s3->handshake_buffer,&hdata);
-               /* Loop through bitso of algorithm2 field and create MD_CTX-es */
-               for (i=0;ssl_get_handshake_digest(i,&mask,&md); i++) 
+       int i;
+       long mask;
+       const EVP_MD *md;
+       long hdatalen;
+       void *hdata;
+
+       /* Allocate handshake_dgst array */
+       ssl3_free_digest_list(s);
+       s->s3->handshake_dgst = OPENSSL_malloc(SSL_MAX_DIGEST * sizeof(EVP_MD_CTX *));
+       memset(s->s3->handshake_dgst,0,SSL_MAX_DIGEST *sizeof(EVP_MD_CTX *));
+       hdatalen = BIO_get_mem_data(s->s3->handshake_buffer,&hdata);
+       if (hdatalen <= 0)
+               {
+               SSLerr(SSL_F_SSL3_DIGEST_CACHED_RECORDS, SSL_R_BAD_HANDSHAKE_LENGTH);
+               return 0;
+               }
+
+       /* Loop through bitso of algorithm2 field and create MD_CTX-es */
+       for (i=0;ssl_get_handshake_digest(i,&mask,&md); i++) 
+               {
+               if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
                        {
-                               if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
-                               {
-                                       s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
-                                       EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
-                                       EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
-                               } 
-                               else 
-                               {       
-                                       s->s3->handshake_dgst[i]=NULL;
-                               }
+                       s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
+                       EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
+                       EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
+                       } 
+               else 
+                       {       
+                       s->s3->handshake_dgst[i]=NULL;
                        }
-               /* Free handshake_buffer BIO */
-               BIO_free(s->s3->handshake_buffer);
-               s->s3->handshake_buffer = NULL;
+               }
+       /* Free handshake_buffer BIO */
+       BIO_free(s->s3->handshake_buffer);
+       s->s3->handshake_buffer = NULL;
 
+       return 1;
        }
+
 int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p)
        {
        return(ssl3_handshake_mac(s,md_nid,NULL,0,p));
@@ -632,10 +650,12 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
        unsigned int i;
        unsigned char md_buf[EVP_MAX_MD_SIZE];
        EVP_MD_CTX ctx,*d=NULL;
+
        if (s->s3->handshake_buffer) 
-               ssl3_digest_cached_records(s);
+               if (!ssl3_digest_cached_records(s))
+                       return 0;
 
-       /* Search for djgest of specified type  in the handshake_dgst
+       /* Search for digest of specified type in the handshake_dgst
         * array*/
        for (i=0;i<SSL_MAX_DIGEST;i++) 
                {
@@ -652,6 +672,9 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
        EVP_MD_CTX_init(&ctx);
        EVP_MD_CTX_copy_ex(&ctx,d);
        n=EVP_MD_CTX_size(&ctx);
+       if (n < 0)
+               return 0;
+
        npad=(48/n)*n;
        if (sender != NULL)
                EVP_DigestUpdate(&ctx,sender,len);
@@ -672,7 +695,7 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
        return((int)ret);
        }
 
-int ssl3_mac(SSL *ssl, unsigned char *md, int send)
+int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
        {
        SSL3_RECORD *rec;
        unsigned char *mac_sec,*seq;
@@ -681,6 +704,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md, int send)
        unsigned char *p,rec_char;
        unsigned int md_size;
        int npad;
+       int t;
 
        if (send)
                {
@@ -697,7 +721,10 @@ int ssl3_mac(SSL *ssl, unsigned char *md, int send)
                hash=ssl->read_hash;
                }
 
-       md_size=EVP_MD_CTX_size(hash);
+       t=EVP_MD_CTX_size(hash);
+       if (t < 0)
+               return -1;
+       md_size=t;
        npad=(48/md_size)*md_size;
 
        /* Chop the digest off the end :-) */