Additional CVE-2014-0224 protection.

Return a fatal error if an attempt is made to use a zero length
master secret.

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 98c36e6b360a4da7ebd680271b75ede9bcd6eadd..59011e39c67ec51a9624da127aebb66d48df5726 100644 (file)
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1459,7 +1459,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);