diff options
| author | Ben Laurie <ben@links.org> | 2013-01-28 17:34:33 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-02-05 16:50:33 +0000 |
| commit | be88529753897c29c677d1becb321f0072c0659c (patch) | |
| tree | 3ef966662f346103f935b7783073501b09a9504a /ssl/t1_enc.c | |
| parent | b3a959a337b8083bc855623f24cebaf43a477350 (diff) | |
Update DTLS code to match CBC decoding in TLS.
This change updates the DTLS code to match the constant-time CBC
behaviour in the TLS.
(cherry picked from commit 9f27de170d1b7bef3d46d41382dc4dafde8b3900)
(cherry picked from commit 5e4ca556e970edb8a7f364fcb6ee6818a965a60b)
Conflicts:
ssl/d1_enc.c
ssl/d1_pkt.c
ssl/s3_pkt.c
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 8968ed0ef7..d621293a74 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -619,11 +619,7 @@ int tls1_enc(SSL *s, int send) if (!send) { if (l == 0 || l%bs != 0) - { - SSLerr(SSL_F_TLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG); - ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED); return 0; - } } EVP_Cipher(ds,rec->data,rec->input,l); |