diff options
author | delphij <delphij@FreeBSD.org> | 2014-01-07 19:58:45 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2014-01-07 19:58:45 +0000 |
commit | 106d50295b278845242fffccba73ac39f8cc971f (patch) | |
tree | 0804b5ed749774647623171c59cc54c7c96f1e41 /crypto/openssl/ssl/s3_both.c | |
parent | 207475f6fd4dbccf6c2c65b978e694628a858ae8 (diff) | |
download | FreeBSD-src-106d50295b278845242fffccba73ac39f8cc971f.zip FreeBSD-src-106d50295b278845242fffccba73ac39f8cc971f.tar.gz |
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
Diffstat (limited to 'crypto/openssl/ssl/s3_both.c')
-rw-r--r-- | crypto/openssl/ssl/s3_both.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s3_both.c b/crypto/openssl/ssl/s3_both.c index ead01c8..ae0ee27 100644 --- a/crypto/openssl/ssl/s3_both.c +++ b/crypto/openssl/ssl/s3_both.c @@ -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; |