From: Matt Caswell <matt@openssl.org>
Date: Fri, 22 Jul 2022 13:16:33 +0000 (+0100)
Subject: Cleanse the SSLv3 MAC secret when we clean up the read record layer
X-Git-Tag: openssl-3.2.0-alpha1~2212
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c77d4556732e2e41e975211498406c777136fbaa;p=thirdparty%2Fopenssl.git

Cleanse the SSLv3 MAC secret when we clean up the read record layer

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

diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index 0f56db5881c..8b541061ba1 100644
--- a/ssl/record/methods/tls_common.c
+++ b/ssl/record/methods/tls_common.c
@@ -1198,7 +1198,6 @@ tls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
 
 static void tls_int_free(OSSL_RECORD_LAYER *rl)
 {
-    /* TODO(RECLAYER): Cleanse sensitive fields */
     BIO_free(rl->prev);
     BIO_free(rl->bio);
     BIO_free(rl->next);
@@ -1210,6 +1209,9 @@ static void tls_int_free(OSSL_RECORD_LAYER *rl)
     COMP_CTX_free(rl->expand);
 #endif
 
+    if (rl->version == SSL3_VERSION)
+        OPENSSL_cleanse(rl->mac_secret, sizeof(rl->mac_secret));
+
     OPENSSL_free(rl);
 }