From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Mon, 27 Jan 2025 02:44:55 +0000 (+1100)
Subject: ossl_provider_prov_ctx is redundant
X-Git-Tag: openssl-3.5.0-alpha1~678
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de578a8a6ad89d035cb82dc3f7d4511f1bb77bd7;p=thirdparty%2Fopenssl.git

ossl_provider_prov_ctx is redundant

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

diff --git a/crypto/provider.c b/crypto/provider.c
index b55561abf83..c804f0a52dd 100644
--- a/crypto/provider.c
+++ b/crypto/provider.c
@@ -102,7 +102,7 @@ void OSSL_PROVIDER_unquery_operation(const OSSL_PROVIDER *prov,
 
 void *OSSL_PROVIDER_get0_provider_ctx(const OSSL_PROVIDER *prov)
 {
-    return ossl_provider_prov_ctx(prov);
+    return ossl_provider_ctx(prov);
 }
 
 const OSSL_DISPATCH *OSSL_PROVIDER_get0_dispatch(const OSSL_PROVIDER *prov)
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 65107936037..a6f2ffa14ea 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -1683,14 +1683,6 @@ const char *ossl_provider_module_path(const OSSL_PROVIDER *prov)
 #endif
 }
 
-void *ossl_provider_prov_ctx(const OSSL_PROVIDER *prov)
-{
-    if (prov != NULL)
-        return prov->provctx;
-
-    return NULL;
-}
-
 const OSSL_DISPATCH *ossl_provider_get0_dispatch(const OSSL_PROVIDER *prov)
 {
     if (prov != NULL)
diff --git a/include/internal/provider.h b/include/internal/provider.h
index cc1e24fa3ca..7410c1005d3 100644
--- a/include/internal/provider.h
+++ b/include/internal/provider.h
@@ -72,7 +72,6 @@ const char *ossl_provider_name(const OSSL_PROVIDER *prov);
 const DSO *ossl_provider_dso(const OSSL_PROVIDER *prov);
 const char *ossl_provider_module_name(const OSSL_PROVIDER *prov);
 const char *ossl_provider_module_path(const OSSL_PROVIDER *prov);
-void *ossl_provider_prov_ctx(const OSSL_PROVIDER *prov);
 const OSSL_DISPATCH *ossl_provider_get0_dispatch(const OSSL_PROVIDER *prov);
 OSSL_LIB_CTX *ossl_provider_libctx(const OSSL_PROVIDER *prov);