Permalink
Browse files

Fix for TLS record tampering bug CVE-2013-4353

  • Loading branch information...
snhenson committed Jan 6, 2014
1 parent c776a3f commit 197e0ea817ad64820789d86711d55ff50d71f631
Showing with 11 additions and 1 deletion.
  1. +5 −0 CHANGES
  2. +1 −0 NEWS
  3. +5 −1 ssl/s3_both.c
View
@@ -4,6 +4,11 @@
Changes between 1.0.1e and 1.0.1f [xx XXX xxxx]
+ *) Fix for TLS record tampering bug. A carefully crafted invalid
+ handshake could crash OpenSSL with a NULL pointer exception.
+ Thanks to Anton Johansson for reporting this issues.
+ (CVE-2013-4353)
+
*) Keep original DTLS digest and encryption contexts in retransmission
structures so we can use the previous session parameters if they need
to be resent. (CVE-2013-6450)
View
1 NEWS
@@ -7,6 +7,7 @@
Major changes between OpenSSL 1.0.1e and OpenSSL 1.0.1f [under development]
+ o Fix for TLS record tampering bug CVE-2013-4353
o Fix for TLS version checking bug CVE-2013-6449
o Fix for DTLS retransmission bug CVE-2013-6450
View
@@ -210,7 +210,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;

0 comments on commit 197e0ea

Please sign in to comment.