aboutsummaryrefslogtreecommitdiff
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-04 19:34:20 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-04 19:34:20 +0000
commita47577164c465cfccbabd820c0d8f362f0242e34 (patch)
tree9c59188c9532bf522bb47cc7168fd363d1a213fb /ssl
parent09d84e03e8bedd1e41223c34d3b5b9249acde4a0 (diff)
downloadopenssl-a47577164c465cfccbabd820c0d8f362f0242e34.zip
openssl-a47577164c465cfccbabd820c0d8f362f0242e34.tar.gz
openssl-a47577164c465cfccbabd820c0d8f362f0242e34.tar.bz2
Since DTLS 1.0 is based on TLS 1.1 we should never return a decryption_failed
alert.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/d1_enc.c6
-rw-r--r--ssl/d1_pkt.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/ssl/d1_enc.c b/ssl/d1_enc.c
index 8fa5734..becbab9 100644
--- a/ssl/d1_enc.c
+++ b/ssl/d1_enc.c
@@ -231,11 +231,7 @@ int dtls1_enc(SSL *s, int send)
if (!send)
{
if (l == 0 || l%bs != 0)
- {
- SSLerr(SSL_F_DTLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
- ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
- return 0;
- }
+ return -1;
}
EVP_Cipher(ds,rec->data,rec->input,l);
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index ee67561..4677110 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -414,7 +414,8 @@ dtls1_process_record(SSL *s)
goto err;
/* otherwise enc_err == -1 */
- goto err;
+ al=SSL_AD_BAD_RECORD_MAC;
+ goto f_err;
}
#ifdef TLS_DEBUG