svn commit: r267103 - in stable: 10/crypto/openssl/ssl 8/crypto/openssl/ssl

[Xin LI]

Author: delphij
Date: Thu Jun  5 12:32:38 2014
New Revision: 267103
URL: http://svnweb.freebsd.org/changeset/base/267103

Log:
  Fix OpenSSL multiple vulnerabilities.
  
  Security:	CVE-2014-0195, CVE-2014-0221, CVE-2014-0224,
  		CVE-2014-3470
  Security:	SA-14:14.openssl

Modified:
  stable/8/crypto/openssl/ssl/d1_both.c
  stable/8/crypto/openssl/ssl/s3_clnt.c
  stable/8/crypto/openssl/ssl/s3_pkt.c
  stable/8/crypto/openssl/ssl/s3_srvr.c
  stable/8/crypto/openssl/ssl/ssl3.h

Changes in other areas also in this revision:
Modified:
  stable/10/crypto/openssl/ssl/d1_both.c
  stable/10/crypto/openssl/ssl/s3_clnt.c
  stable/10/crypto/openssl/ssl/s3_pkt.c
  stable/10/crypto/openssl/ssl/s3_srvr.c
  stable/10/crypto/openssl/ssl/ssl3.h

Modified: stable/8/crypto/openssl/ssl/d1_both.c
==============================================================================
--- stable/8/crypto/openssl/ssl/d1_both.c	Thu Jun  5 12:32:16 2014	(r267102)
+++ stable/8/crypto/openssl/ssl/d1_both.c	Thu Jun  5 12:32:38 2014	(r267103)
@@ -620,7 +620,16 @@ dtls1_reassemble_fragment(SSL *s, struct
 		frag->msg_header.frag_off = 0;
 		}
 	else
+		{
 		frag = (hm_fragment*) item->data;
+		if (frag->msg_header.msg_len != msg_hdr->msg_len)
+			{
+			item = NULL;
+			frag = NULL;
+			goto err;
+			}
+		}
+
 
 	/* If message is already reassembled, this must be a
 	 * retransmit and can be dropped.
@@ -777,6 +786,7 @@ dtls1_get_message_fragment(SSL *s, int s
 	int i,al;
 	struct hm_header_st msg_hdr;
 
+	redo:
 	/* see if we have the required fragment already */
 	if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok)
 		{
@@ -835,8 +845,7 @@ dtls1_get_message_fragment(SSL *s, int s
 					s->msg_callback_arg);
 			
 			s->init_num = 0;
-			return dtls1_get_message_fragment(s, st1, stn,
-				max, ok);
+			goto redo;
 			}
 		else /* Incorrectly formated Hello request */
 			{

Modified: stable/8/crypto/openssl/ssl/s3_clnt.c
==============================================================================
--- stable/8/crypto/openssl/ssl/s3_clnt.c	Thu Jun  5 12:32:16 2014	(r267102)
+++ stable/8/crypto/openssl/ssl/s3_clnt.c	Thu Jun  5 12:32:38 2014	(r267103)
@@ -491,6 +491,7 @@ int ssl3_connect(SSL *s)
 		case SSL3_ST_CR_FINISHED_A:
 		case SSL3_ST_CR_FINISHED_B:
 
+			s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
 				SSL3_ST_CR_FINISHED_B);
 			if (ret <= 0) goto end;
@@ -777,6 +778,7 @@ int ssl3_get_server_hello(SSL *s)
 		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
 		goto f_err;
 		}
+	    s->s3->flags |= SSL3_FLAGS_CCS_OK;
 	    s->hit=1;
 	    }
 	else	/* a miss or crap from the other end */
@@ -2170,6 +2172,13 @@ int ssl3_send_client_key_exchange(SSL *s
 			int ecdh_clnt_cert = 0;
 			int field_size = 0;
 
+			if (s->session->sess_cert == NULL) 
+				{
+				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
+				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+				goto err;
+				}
+
 			/* Did we send out the client's
 			 * ECDH share for use in premaster
 			 * computation as part of client certificate?

Modified: stable/8/crypto/openssl/ssl/s3_pkt.c
==============================================================================
--- stable/8/crypto/openssl/ssl/s3_pkt.c	Thu Jun  5 12:32:16 2014	(r267102)
+++ stable/8/crypto/openssl/ssl/s3_pkt.c	Thu Jun  5 12:32:38 2014	(r267103)
@@ -1147,6 +1147,15 @@ start:
 			goto f_err;
 			}
 
+		if (!(s->s3->flags & SSL3_FLAGS_CCS_OK))
+			{
+			al=SSL_AD_UNEXPECTED_MESSAGE;
+			SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_CCS_RECEIVED_EARLY);
+			goto f_err;
+			}
+
+		s->s3->flags &= ~SSL3_FLAGS_CCS_OK;
+
 		rr->length=0;
 
 		if (s->msg_callback)
@@ -1278,7 +1287,7 @@ int ssl3_do_change_cipher_spec(SSL *s)
 
 	if (s->s3->tmp.key_block == NULL)
 		{
-		if (s->session == NULL) 
+		if (s->session == NULL || s->session->master_key_length == 0)
 			{
 			/* might happen if dtls1_read_bytes() calls this */
 			SSLerr(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC,SSL_R_CCS_RECEIVED_EARLY);

Modified: stable/8/crypto/openssl/ssl/s3_srvr.c
==============================================================================
--- stable/8/crypto/openssl/ssl/s3_srvr.c	Thu Jun  5 12:32:16 2014	(r267102)
+++ stable/8/crypto/openssl/ssl/s3_srvr.c	Thu Jun  5 12:32:38 2014	(r267103)
@@ -523,6 +523,7 @@ int ssl3_accept(SSL *s)
 		case SSL3_ST_SR_CERT_VRFY_A:
 		case SSL3_ST_SR_CERT_VRFY_B:
 
+			s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			/* we should decide if we expected this one */
 			ret=ssl3_get_cert_verify(s);
 			if (ret <= 0) goto end;
@@ -533,6 +534,7 @@ int ssl3_accept(SSL *s)
 
 		case SSL3_ST_SR_FINISHED_A:
 		case SSL3_ST_SR_FINISHED_B:
+			s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A,
 				SSL3_ST_SR_FINISHED_B);
 			if (ret <= 0) goto end;

Modified: stable/8/crypto/openssl/ssl/ssl3.h
==============================================================================
--- stable/8/crypto/openssl/ssl/ssl3.h	Thu Jun  5 12:32:16 2014	(r267102)
+++ stable/8/crypto/openssl/ssl/ssl3.h	Thu Jun  5 12:32:38 2014	(r267103)
@@ -344,6 +344,7 @@ typedef struct ssl3_buffer_st
  * effected, but we can't prevent that.
  */
 #define SSL3_FLAGS_SGC_RESTART_DONE		0x0040
+#define SSL3_FLAGS_CCS_OK			0x0080
 
 typedef struct ssl3_state_st
 	{