Add fix for CVE-2013-4353

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 8de149aaa6330d5f6c48e441faaddd6b237a0192..0a259b1f4f6cbbace47c844b0428a1157fe0e15e 100644 (file)
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -203,7 +203,11 @@ static void ssl3_take_mac(SSL *s)
        {
        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;