Author: delphij
Date: Tue Jan 7 19:58:45 2014
New Revision: 260403
URL: http://svnweb.freebsd.org/changeset/base/260403
Log:
MFV r260399:
Apply vendor commits:
197e0ea Fix for TLS record tampering bug. (CVE-2013-4353).
3462896 For DTLS we might need to retransmit messages from the
previous session so keep a copy of write context in DTLS
retransmission buffers instead of replacing it after
sending CCS. (CVE-2013-6450).
ca98926 When deciding whether to use TLS 1.2 PRF and record hash
algorithms use the version number in the corresponding
SSL_METHOD structure instead of the SSL structure. The
SSL structure version is sometimes inaccurate.
Note: OpenSSL 1.0.2 and later effectively do this already.
(CVE-2013-6449).
Security: CVE-2013-4353
Security: CVE-2013-6449
Security: CVE-2013-6450
Modified:
head/crypto/openssl/ssl/d1_both.c
head/crypto/openssl/ssl/s3_both.c
head/crypto/openssl/ssl/s3_lib.c
head/crypto/openssl/ssl/ssl_locl.h
head/crypto/openssl/ssl/t1_enc.c
Directory Properties:
head/crypto/openssl/ (props changed)
Modified: head/crypto/openssl/ssl/d1_both.c
==============================================================================
--- head/crypto/openssl/ssl/d1_both.c Tue Jan 7 19:46:17 2014
(r260402)
+++ head/crypto/openssl/ssl/d1_both.c Tue Jan 7 19:58:45 2014
(r260403)
@@ -214,6 +214,12 @@ dtls1_hm_fragment_new(unsigned long frag
static void
dtls1_hm_fragment_free(hm_fragment *frag)
{
+
+ if (frag->msg_header.is_ccs)
+ {
+
EVP_CIPHER_CTX_free(frag->msg_header.saved_retransmit_state.enc_write_ctx);
+
EVP_MD_CTX_destroy(frag->msg_header.saved_retransmit_state.write_hash);
+ }
if (frag->fragment) OPENSSL_free(frag->fragment);
if (frag->reassembly) OPENSSL_free(frag->reassembly);
OPENSSL_free(frag);
Modified: head/crypto/openssl/ssl/s3_both.c
==============================================================================
--- head/crypto/openssl/ssl/s3_both.c Tue Jan 7 19:46:17 2014
(r260402)
+++ head/crypto/openssl/ssl/s3_both.c Tue Jan 7 19:58:45 2014
(r260403)
@@ -208,7 +208,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;
Modified: head/crypto/openssl/ssl/s3_lib.c
==============================================================================
--- head/crypto/openssl/ssl/s3_lib.c Tue Jan 7 19:46:17 2014
(r260402)
+++ head/crypto/openssl/ssl/s3_lib.c Tue Jan 7 19:58:45 2014
(r260403)
@@ -4274,7 +4274,7 @@ need to go to SSL_ST_ACCEPT.
long ssl_get_algorithm2(SSL *s)
{
long alg2 = s->s3->tmp.new_cipher->algorithm2;
- if (TLS1_get_version(s) >= TLS1_2_VERSION &&
+ if (s->method->version == TLS1_2_VERSION &&
alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF))
return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256;
return alg2;
Modified: head/crypto/openssl/ssl/ssl_locl.h
==============================================================================
--- head/crypto/openssl/ssl/ssl_locl.h Tue Jan 7 19:46:17 2014
(r260402)
+++ head/crypto/openssl/ssl/ssl_locl.h Tue Jan 7 19:58:45 2014
(r260403)
@@ -621,6 +621,8 @@ extern SSL3_ENC_METHOD TLSv1_enc_data;
extern SSL3_ENC_METHOD SSLv3_enc_data;
extern SSL3_ENC_METHOD DTLSv1_enc_data;
+#define SSL_IS_DTLS(s) (s->method->version == DTLS1_VERSION)
+
#define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \
s_get_meth) \
const SSL_METHOD *func_name(void) \
Modified: head/crypto/openssl/ssl/t1_enc.c
==============================================================================
--- head/crypto/openssl/ssl/t1_enc.c Tue Jan 7 19:46:17 2014
(r260402)
+++ head/crypto/openssl/ssl/t1_enc.c Tue Jan 7 19:58:45 2014
(r260403)
@@ -414,15 +414,20 @@ int tls1_change_cipher_state(SSL *s, int
s->mac_flags |= SSL_MAC_FLAG_WRITE_MAC_STREAM;
else
s->mac_flags &= ~SSL_MAC_FLAG_WRITE_MAC_STREAM;
- if (s->enc_write_ctx != NULL)
+ if (s->enc_write_ctx != NULL && !SSL_IS_DTLS(s))
reuse_dd = 1;
- else if
((s->enc_write_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)
+ else if ((s->enc_write_ctx=EVP_CIPHER_CTX_new()) == NULL)
goto err;
- else
- /* make sure it's intialized in case we exit later with
an error */
- EVP_CIPHER_CTX_init(s->enc_write_ctx);
dd= s->enc_write_ctx;
- mac_ctx = ssl_replace_hash(&s->write_hash,NULL);
+ if (SSL_IS_DTLS(s))
+ {
+ mac_ctx = EVP_MD_CTX_create();
+ if (!mac_ctx)
+ goto err;
+ s->write_hash = mac_ctx;
+ }
+ else
+ mac_ctx = ssl_replace_hash(&s->write_hash,NULL);
#ifndef OPENSSL_NO_COMP
if (s->compress != NULL)
{
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
