From: Neil Horman <nhorman@openssl.org>
Date: Fri, 8 May 2026 14:10:05 +0000 (-0400)
Subject: make EVP_KEM not do refcounting
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4971f4830c03e8aaa07fa1478e7c027711b237da;p=thirdparty%2Fopenssl.git

make EVP_KEM not do refcounting

Reviewed-by: Bob Beck <beck@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Thu Jun 25 21:25:57 2026
(Merged from https://github.com/openssl/openssl/pull/31143)
---

diff --git a/crypto/evp/kem.c b/crypto/evp/kem.c
index 92db9618929..48de927ce43 100644
--- a/crypto/evp/kem.c
+++ b/crypto/evp/kem.c
@@ -19,12 +19,28 @@
 
 static void evp_kem_free(void *data)
 {
-    EVP_KEM_free(data);
+    EVP_KEM *kem = (EVP_KEM *)data;
+    int i;
+
+    if (kem == NULL)
+        return;
+
+    CRYPTO_DOWN_REF(&kem->refcnt, &i);
+    if (i > 0)
+        return;
+    OPENSSL_free(kem->type_name);
+    ossl_provider_free(kem->prov);
+    CRYPTO_FREE_REF(&kem->refcnt);
+    OPENSSL_free(kem);
 }
 
 static int evp_kem_up_ref(void *data)
 {
-    return EVP_KEM_up_ref(data);
+    EVP_KEM *kem = (EVP_KEM *)data;
+    int ref = 0;
+
+    CRYPTO_UP_REF(&kem->refcnt, &ref);
+    return 1;
 }
 
 static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
@@ -432,26 +448,18 @@ err:
 
 void EVP_KEM_free(EVP_KEM *kem)
 {
-    int i;
-
-    if (kem == NULL)
-        return;
-
-    CRYPTO_DOWN_REF(&kem->refcnt, &i);
-    if (i > 0)
-        return;
-    OPENSSL_free(kem->type_name);
-    ossl_provider_free(kem->prov);
-    CRYPTO_FREE_REF(&kem->refcnt);
-    OPENSSL_free(kem);
+#ifdef OPENSSL_NO_CACHED_FETCH
+    evp_kem_free(kem);
+#endif
 }
 
 int EVP_KEM_up_ref(EVP_KEM *kem)
 {
-    int ref = 0;
-
-    CRYPTO_UP_REF(&kem->refcnt, &ref);
+#ifdef OPENSSL_NO_CACHED_FETCH
+    return evp_kem_up_ref(kem);
+#else
     return 1;
+#endif
 }
 
 OSSL_PROVIDER *EVP_KEM_get0_provider(const EVP_KEM *kem)