summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-04 19:39:27 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-04 19:39:27 +0000
commit722521594cfec2d972f0773f6d82c69cda4a621c (patch)
tree56c1dae24393aa2c4134d7f84bc3b9dc1f056718 /ssl
parenta47577164c465cfccbabd820c0d8f362f0242e34 (diff)
Don't use decryption_failed alert for TLS v1.1 or later.
Diffstat (limited to 'ssl')
-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;