Commit 5b5464d5 authored by Bodo Möller's avatar Bodo Möller
Browse files

Fix for "Record of death" vulnerability CVE-2010-0740. 

Also, add missing CHANGES entry for CVE-2009-3245 (code changes submitted to this branch on 23 Feb 2010).
parent cd15a052

CHANGES

+17 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 OpenSSL CHANGES

 _______________



 Changes between 0.9.8m (?) and 1.0.0  [xx XXX xxxx]

 Changes between 0.9.8n and 1.0.0  [xx XXX xxxx]



  *) Add "missing" function EVP_CIPHER_CTX_copy(). This copies a cipher

     context. The operation can be customised via the ctrl mechanism in
@@ -843,7 +843,16 @@ 
  *) Change 'Configure' script to enable Camellia by default.

     [NTT]

  

   Changes between 0.9.8m and 0.9.8n [xx XXX xxxx]

 Changes between 0.9.8m and 0.9.8n [24 Mar 2010]



  *) When rejecting SSL/TLS records due to an incorrect version number, never

     update s->server with a new major version number.  As of

     - OpenSSL 0.9.8m if 'short' is a 16-bit type,

     - OpenSSL 0.9.8f if 'short' is longer than 16 bits,

     the previous behavior could result in a read attempt at NULL when

     receiving specific incorrect SSL/TLS records once record payload

     protection is active.  (CVE-2010-####)

     [Bodo Moeller, Adam Langley]



  *) Fix for CVE-2010-0433 where some kerberos enabled versions of OpenSSL 

     could be crashed if the relevant tables were not present (e.g. chrooted).
@@ -851,6 +860,9 @@ 


 Changes between 0.9.8l and 0.9.8m [25 Feb 2010]



  *) Always check bn_wexpend() return values for failure.  (CVE-2009-3245)

     [Martin Olsson, Neel Mehta]



  *) Fix X509_STORE locking: Every 'objs' access requires a lock (to

     accommodate for stack sorting, always a write lock!).

     [Bodo Moeller]

ssl/s3_pkt.c

+3 −3
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length); 
			if (version != s->version)

				{

				SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);

				/* Send back error using their

				 * version number :-) */

				s->version=version;

                                if ((s->version & 0xFF00) == (version & 0xFF00))

                                	/* Send back error using their minor version number :-) */

					s->version = (unsigned short)version;

				al=SSL_AD_PROTOCOL_VERSION;

				goto f_err;

				}