From: Matt Caswell <matt@openssl.org>
Date: Mon, 17 Oct 2022 13:37:32 +0000 (+0100)
Subject: Remove supurious set of the record type
X-Git-Tag: openssl-3.2.0-alpha1~1879
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3abc0d3e8504f730117e3b68dfb1aab81c5e51fe;p=thirdparty%2Fopenssl.git

Remove supurious set of the record type

We already set the record type on the SSL3_RECORD structure. We don't
need to do it again (inconsistently).

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19424)
---

diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index 40016c121dd..5c27a6af151 100644
--- a/ssl/record/methods/tls_common.c
+++ b/ssl/record/methods/tls_common.c
@@ -1823,13 +1823,6 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
             goto err;
         }
 
-        /*
-         * we should now have thiswr->data pointing to the encrypted data, which
-         * is thiswr->length long.
-         * Setting the type is not needed but helps for debugging
-         */
-        SSL3_RECORD_set_type(thiswr, thistempl->type);
-
         /* now let's set up wb */
         SSL3_BUFFER_set_left(&rl->wbuf[j], SSL3_RECORD_get_length(thiswr));
     }