From: Anatolii Lishchynskyi <iamnotacake@protonmail.com>
Date: Wed, 29 Mar 2023 14:16:48 +0000 (+0300)
Subject: Erase temporary buffer in EVP_PKEY_get_bn_param()
X-Git-Tag: openssl-3.2.0-alpha1~1029
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34e4a962bca998cc2d6eb4be721153fbde2f4c35;p=thirdparty%2Fopenssl.git

Erase temporary buffer in EVP_PKEY_get_bn_param()

Function EVP_PKEY_get_bn_param() uses temporary buffer (on stack or
heap allocated) to store serialized bignum, but after deserializing it
into BIGNUM*, the buffer is not erased and may contain sensitive data.

This change makes sure the buffer is erased if it was successfully
filled before. Unfortunately, it does not distinguish between public and
private key components, and will always erase the buffer.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20639)
---

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 554fad927c1..fa51304c97b 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -2176,7 +2176,14 @@ int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
         goto err;
     ret = OSSL_PARAM_get_BN(params, bn);
 err:
-    OPENSSL_free(buf);
+    if (buf != NULL) {
+        if (OSSL_PARAM_modified(params))
+            OPENSSL_clear_free(buf, buf_sz);
+        else
+            OPENSSL_free(buf);
+    } else if (OSSL_PARAM_modified(params)) {
+        OPENSSL_cleanse(buffer, params[0].data_size);
+    }
     return ret;
 }