Additional CVE-2014-0224 protection.
authorDr. Stephen Henson <steve@openssl.org>
Fri, 16 May 2014 11:55:16 +0000 (12:55 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 3 Jun 2014 15:30:23 +0000 (16:30 +0100)
Return a fatal error if an attempt is made to use a zero length
master secret.

ssl/s3_pkt.c

index 6caa3bb..c087fee 100644 (file)
@@ -1306,7 +1306,7 @@ int ssl3_do_change_cipher_spec(SSL *s)
 
        if (s->s3->tmp.key_block == NULL)
                {
-               if (s->session == NULL
+               if (s->session == NULL || s->session->master_key_length == 0)
                        {
                        /* might happen if dtls1_read_bytes() calls this */
                        SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY);