Add fix for CVE-2013-4353
authorDr. Stephen Henson <steve@openssl.org>
Tue, 7 Jan 2014 15:37:35 +0000 (15:37 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 7 Jan 2014 15:39:21 +0000 (15:39 +0000)
(cherry picked from commit 6b42ed4e7104898f4b5b69337589719913b36404)

ssl/s3_both.c

index 8de149a..0a259b1 100644 (file)
@@ -203,7 +203,11 @@ static void ssl3_take_mac(SSL *s)
        {
        const char *sender;
        int slen;
        {
        const char *sender;
        int slen;
-
+       /* If no new cipher setup return immediately: other functions will
+        * set the appropriate error.
+        */
+       if (s->s3->tmp.new_cipher == NULL)
+               return;
        if (s->state & SSL_ST_CONNECT)
                {
                sender=s->method->ssl3_enc->server_finished_label;
        if (s->state & SSL_ST_CONNECT)
                {
                sender=s->method->ssl3_enc->server_finished_label;