From: Matt Caswell <matt@openssl.org>
Date: Tue, 21 Mar 2017 16:12:37 +0000 (+0000)
Subject: Fix BAD CCS alert in DTLS
X-Git-Tag: OpenSSL_1_0_2l~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ed92460b7a4a2a310f1b0dde6e36f9055f5b87b;p=oweals%2Fopenssl.git

Fix BAD CCS alert in DTLS

Set the correct variable, and then actually send the alert!

Found by, and fix suggested by, Raja Ashok.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3009)
---

diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 7a02459f2b..10586fee54 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -1323,9 +1323,9 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
         /* XDTLS: check that epoch is consistent */
         if ((rr->length != ccs_hdr_len) ||
             (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS)) {
-            i = SSL_AD_ILLEGAL_PARAMETER;
+            al = SSL_AD_ILLEGAL_PARAMETER;
             SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_BAD_CHANGE_CIPHER_SPEC);
-            goto err;
+            goto f_err;
         }
 
         rr->length = 0;