From d0072c6d57fb01bda7f93174c317b7ea3ff8afc7 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 6 Jan 2014 14:35:04 +0000 Subject: [PATCH 11/17] Fix for TLS record tampering bug CVE-2013-4353 Conflicts: CHANGES NEWS modified: ssl/s3_both.c --- ssl/s3_both.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ssl/s3_both.c b/ssl/s3_both.c index ead01c8..ae0ee27 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -208,7 +208,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; -- 1.7.9.5