Date: Thu, 5 Jun 2014 12:33:23 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r267104 - in releng: 10.0 10.0/crypto/openssl/ssl 10.0/sys/conf 8.4 8.4/crypto/openssl/ssl 8.4/sys/conf 9.1 9.1/crypto/openssl/ssl 9.1/sys/conf 9.2 9.2/crypto/openssl/ssl 9.2/sys/conf Message-ID: <201406051233.s55CXNHu038670@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Thu Jun 5 12:33:23 2014 New Revision: 267104 URL: http://svnweb.freebsd.org/changeset/base/267104 Log: Fix OpenSSL multiple vulnerabilities. Security: CVE-2014-0195, CVE-2014-0221, CVE-2014-0224, CVE-2014-3470 Security: SA-14:14.openssl Approved by: so Modified: releng/10.0/UPDATING releng/10.0/crypto/openssl/ssl/d1_both.c releng/10.0/crypto/openssl/ssl/s3_clnt.c releng/10.0/crypto/openssl/ssl/s3_pkt.c releng/10.0/crypto/openssl/ssl/s3_srvr.c releng/10.0/crypto/openssl/ssl/ssl3.h releng/10.0/sys/conf/newvers.sh releng/8.4/UPDATING releng/8.4/crypto/openssl/ssl/d1_both.c releng/8.4/crypto/openssl/ssl/s3_clnt.c releng/8.4/crypto/openssl/ssl/s3_pkt.c releng/8.4/crypto/openssl/ssl/s3_srvr.c releng/8.4/crypto/openssl/ssl/ssl3.h releng/8.4/sys/conf/newvers.sh releng/9.1/UPDATING releng/9.1/crypto/openssl/ssl/d1_both.c releng/9.1/crypto/openssl/ssl/s3_clnt.c releng/9.1/crypto/openssl/ssl/s3_pkt.c releng/9.1/crypto/openssl/ssl/s3_srvr.c releng/9.1/crypto/openssl/ssl/ssl3.h releng/9.1/sys/conf/newvers.sh releng/9.2/UPDATING releng/9.2/crypto/openssl/ssl/d1_both.c releng/9.2/crypto/openssl/ssl/s3_clnt.c releng/9.2/crypto/openssl/ssl/s3_pkt.c releng/9.2/crypto/openssl/ssl/s3_srvr.c releng/9.2/crypto/openssl/ssl/ssl3.h releng/9.2/sys/conf/newvers.sh Modified: releng/10.0/UPDATING ============================================================================== --- releng/10.0/UPDATING Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/UPDATING Thu Jun 5 12:33:23 2014 (r267104) @@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20140605: p5 FreeBSD-SA-14:14.openssl + Fix OpenSSL multiple vulnerabilities. [SA-14:14] + 20140603: p4 FreeBSD-SA-14:11.sendmail FreeBSD-SA-14:13.pam FreeBSD-EN-14:06.exec Modified: releng/10.0/crypto/openssl/ssl/d1_both.c ============================================================================== --- releng/10.0/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:33:23 2014 (r267104) @@ -626,7 +626,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. @@ -783,6 +792,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) { @@ -841,8 +851,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: releng/10.0/crypto/openssl/ssl/s3_clnt.c ============================================================================== --- releng/10.0/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -559,6 +559,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; @@ -916,6 +917,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 */ @@ -2511,6 +2513,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: releng/10.0/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- releng/10.0/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -1301,6 +1301,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) @@ -1435,7 +1444,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: releng/10.0/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- releng/10.0/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:33:23 2014 (r267104) @@ -673,6 +673,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; @@ -700,6 +701,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; @@ -770,7 +772,10 @@ int ssl3_accept(SSL *s) s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; #else if (s->s3->next_proto_neg_seen) + { + s->s3->flags |= SSL3_FLAGS_CCS_OK; s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A; + } else s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A; #endif Modified: releng/10.0/crypto/openssl/ssl/ssl3.h ============================================================================== --- releng/10.0/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:33:23 2014 (r267104) @@ -399,6 +399,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 #ifndef OPENSSL_NO_SSL_INTERN Modified: releng/10.0/sys/conf/newvers.sh ============================================================================== --- releng/10.0/sys/conf/newvers.sh Thu Jun 5 12:32:38 2014 (r267103) +++ releng/10.0/sys/conf/newvers.sh Thu Jun 5 12:33:23 2014 (r267104) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.0" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/8.4/UPDATING ============================================================================== --- releng/8.4/UPDATING Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/UPDATING Thu Jun 5 12:33:23 2014 (r267104) @@ -15,6 +15,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. debugging tools present in HEAD were left in place because sun4v support still needs work to become production ready. +20140605: p12 FreeBSD-SA-14:14.openssl + Fix OpenSSL multiple vulnerabilities. [SA-14:14] + 20140603: p11 FreeBSD-SA-14:11.sendmail FreeBSD-SA-14:12.ktrace FreeBSD-EN-14:06.exec Modified: releng/8.4/crypto/openssl/ssl/d1_both.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/8.4/crypto/openssl/ssl/s3_clnt.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/8.4/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/8.4/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/8.4/crypto/openssl/ssl/ssl3.h ============================================================================== --- releng/8.4/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:33:23 2014 (r267104) @@ -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 { Modified: releng/8.4/sys/conf/newvers.sh ============================================================================== --- releng/8.4/sys/conf/newvers.sh Thu Jun 5 12:32:38 2014 (r267103) +++ releng/8.4/sys/conf/newvers.sh Thu Jun 5 12:33:23 2014 (r267104) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.4" -BRANCH="RELEASE-p11" +BRANCH="RELEASE-p12" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.1/UPDATING ============================================================================== --- releng/9.1/UPDATING Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/UPDATING Thu Jun 5 12:33:23 2014 (r267104) @@ -9,6 +9,9 @@ handbook. Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20140605: p15 FreeBSD-SA-14:14.openssl + Fix OpenSSL multiple vulnerabilities. [SA-14:14] + 20140603: p14 FreeBSD-SA-14:11.sendmail FreeBSD-SA-14:12.ktrace FreeBSD-SA-14:13.pam Modified: releng/9.1/crypto/openssl/ssl/d1_both.c ============================================================================== --- releng/9.1/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.1/crypto/openssl/ssl/s3_clnt.c ============================================================================== --- releng/9.1/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.1/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- releng/9.1/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.1/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- releng/9.1/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.1/crypto/openssl/ssl/ssl3.h ============================================================================== --- releng/9.1/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:33:23 2014 (r267104) @@ -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 { Modified: releng/9.1/sys/conf/newvers.sh ============================================================================== --- releng/9.1/sys/conf/newvers.sh Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.1/sys/conf/newvers.sh Thu Jun 5 12:33:23 2014 (r267104) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.1" -BRANCH="RELEASE-p14" +BRANCH="RELEASE-p15" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/9.2/UPDATING ============================================================================== --- releng/9.2/UPDATING Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/UPDATING Thu Jun 5 12:33:23 2014 (r267104) @@ -11,6 +11,9 @@ handbook: Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20140605: p8 FreeBSD-SA-14:14.openssl + Fix OpenSSL multiple vulnerabilities. [SA-14:14] + 20140603: p7 FreeBSD-SA-14:11.sendmail FreeBSD-SA-14:12.ktrace FreeBSD-SA-14:13.pam Modified: releng/9.2/crypto/openssl/ssl/d1_both.c ============================================================================== --- releng/9.2/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/crypto/openssl/ssl/d1_both.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.2/crypto/openssl/ssl/s3_clnt.c ============================================================================== --- releng/9.2/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/crypto/openssl/ssl/s3_clnt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.2/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- releng/9.2/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/crypto/openssl/ssl/s3_pkt.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.2/crypto/openssl/ssl/s3_srvr.c ============================================================================== --- releng/9.2/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/crypto/openssl/ssl/s3_srvr.c Thu Jun 5 12:33:23 2014 (r267104) @@ -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: releng/9.2/crypto/openssl/ssl/ssl3.h ============================================================================== --- releng/9.2/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/crypto/openssl/ssl/ssl3.h Thu Jun 5 12:33:23 2014 (r267104) @@ -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 { Modified: releng/9.2/sys/conf/newvers.sh ============================================================================== --- releng/9.2/sys/conf/newvers.sh Thu Jun 5 12:32:38 2014 (r267103) +++ releng/9.2/sys/conf/newvers.sh Thu Jun 5 12:33:23 2014 (r267104) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.2" -BRANCH="RELEASE-p7" +BRANCH="RELEASE-p8" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406051233.s55CXNHu038670>