From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 20 Sep 2021 15:14:29 +0000 (-0400)
Subject: Restore OpenSSL 1.0 compatibility in softpkcs11
X-Git-Tag: krb5-1.20-beta1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1218%2Fhead;p=thirdparty%2Fkrb5.git

Restore OpenSSL 1.0 compatibility in softpkcs11

Commit 00de1aad7b3647b91017c7009b0bc65cd0c8b2e0 used
OPENSSL_clear_free(), which was added in OpenSSL 1.1.  Use
OPENSSL_cleanse() and OPENSSL_free() instead.
---

diff --git a/src/tests/softpkcs11/main.c b/src/tests/softpkcs11/main.c
index 86b4ef711b..82b05ff0da 100644
--- a/src/tests/softpkcs11/main.c
+++ b/src/tests/softpkcs11/main.c
@@ -1590,7 +1590,8 @@ C_Encrypt(CK_SESSION_HANDLE hSession,
 
     ret = CKR_OK;
 out:
-    OPENSSL_clear_free(buffer, buffer_len);
+    OPENSSL_cleanse(buffer, buffer_len);
+    OPENSSL_free(buffer);
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }
@@ -1732,7 +1733,8 @@ C_Decrypt(CK_SESSION_HANDLE hSession,
 
     ret = CKR_OK;
 out:
-    OPENSSL_clear_free(buffer, buffer_len);
+    OPENSSL_cleanse(buffer, buffer_len);
+    OPENSSL_free(buffer);
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }
@@ -1879,7 +1881,8 @@ C_Sign(CK_SESSION_HANDLE hSession,
 
     ret = CKR_OK;
 out:
-    OPENSSL_clear_free(buffer, buffer_len);
+    OPENSSL_cleanse(buffer, buffer_len);
+    OPENSSL_free(buffer);
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }