From: Matt Caswell <matt@openssl.org>
Date: Thu, 11 May 2017 09:16:08 +0000 (+0100)
Subject: Check that a TLSv1.3 encrypted message has an app data content type
X-Git-Tag: OpenSSL_1_1_1-pre1~1536
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c544acc385ac39b77873c9cfa77c4ae5df956b5;p=oweals%2Fopenssl.git

Check that a TLSv1.3 encrypted message has an app data content type

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3436)
---

diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index 806ef43469..4b36f49b6d 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -618,7 +618,8 @@ int ssl3_get_record(SSL *s)
         if (SSL_IS_TLS13(s) && s->enc_read_ctx != NULL) {
             size_t end;
 
-            if (thisrr->length == 0) {
+            if (thisrr->length == 0
+                    || thisrr->type != SSL3_RT_APPLICATION_DATA) {
                 al = SSL_AD_UNEXPECTED_MESSAGE;
                 SSLerr(SSL_F_SSL3_GET_RECORD, SSL_R_BAD_RECORD_TYPE);
                 goto f_err;