summaryrefslogtreecommitdiffstats
path: root/ssl/t1_enc.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-04 19:39:42 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-04 19:39:42 +0000
commit4577b38d22429c1f21c5a675ba4a3e5b1a326e37 (patch)
tree0ea1b80521c39d00e0c45b2cbb3c2415030a27b0 /ssl/t1_enc.c
parenta8515e2d28736090a18cf66345c9bd07cfd6ffcc (diff)
Don't use decryption_failed alert for TLS v1.1 or later.
Diffstat (limited to 'ssl/t1_enc.c')
-rw-r--r--ssl/t1_enc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 2b3fd30e42..c418d3217a 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -757,6 +757,8 @@ int tls1_enc(SSL *s, int send)
{
if (l == 0 || l%bs != 0)
{
+ if (s->version >= TLS1_1_VERSION)
+ return -1;
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;