diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-08-08 22:26:03 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-08-08 22:26:03 +0000 |
| commit | ed4c5254dd244e65403ee0ca57f1a5727ff1761d (patch) | |
| tree | f3ae927d75d595f695ee3d39ae67ded1e8121bd5 | |
| parent | f3b8b34a882a09ff73facc4c6ce7cdcad59b8656 (diff) | |
| download | src-ed4c5254dd244e65403ee0ca57f1a5727ff1761d.tar.gz src-ed4c5254dd244e65403ee0ca57f1a5727ff1761d.zip | |
Integrate OpenSSL commit 9fe4603b8245425a4c46986ed000fca054231253:
Author: David Woodhouse <dwmw2@infradead.org>
Date: Tue Feb 12 14:55:32 2013 +0000
Check DTLS_BAD_VER for version number.
The version check for DTLS1_VERSION was redundant as
DTLS1_VERSION > TLS1_1_VERSION, however we do need to
check for DTLS1_BAD_VER for compatibility.
PR:2984
(cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc)
Approved by: benl
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=254106
| -rw-r--r-- | ssl/s3_cbc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index 02edf3f9189e..443a31e74627 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s, unsigned padding_length, good, to_check, i; const unsigned overhead = 1 /* padding length byte */ + mac_size; /* Check if version requires explicit IV */ - if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION) + if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER) { /* These lengths are all public so we can test them in * non-constant time. |