Commit 197e0ea8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix for TLS record tampering bug CVE-2013-4353

parent c776a3f3

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -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)

NEWS

+1 −0
Original line number Diff line number Diff line
@@ -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

ssl/s3_both.c

+5 −1
Original line number Diff line number Diff line
@@ -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;