From: Matt Caswell <matt@openssl.org>
Date: Fri, 6 Jan 2017 16:22:23 +0000 (+0000)
Subject: ChangeCipherSpec is not allowed in TLSv1.3
X-Git-Tag: OpenSSL_1_1_1-pre1~2584
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97997489748c79466bc18789e1f44d742887a32d;p=oweals%2Fopenssl.git

ChangeCipherSpec is not allowed in TLSv1.3

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

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index f0ac4a4df3..5f37b0fa66 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1223,7 +1223,8 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
 
     if (type == SSL3_RECORD_get_type(rr)
         || (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC
-            && type == SSL3_RT_HANDSHAKE && recvd_type != NULL)) {
+            && type == SSL3_RT_HANDSHAKE && recvd_type != NULL
+            && !SSL_IS_TLS13(s))) {
         /*
          * SSL3_RT_APPLICATION_DATA or
          * SSL3_RT_HANDSHAKE or