Since DTLS 1.0 is based on TLS 1.1 we should never return a decryption_failed

alert.

diff --git a/ssl/d1_enc.c b/ssl/d1_enc.c
index 8fa57347a99e646d5f30b49a87673e2934270585..becbab91c219617452c9bacda251dadaf93331ee 100644 (file)
--- 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 1fd58bf598a706411559bf1ce8695ba76cbbf68c..c1051422258ae096e7840176b981204414fa0efe 100644 (file)
--- 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