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 b55561abf8318deaf6f46478813bef4be51e0db9..c804f0a52ddeca43f5169123557aaebbae205bed 100644 (file)
--- 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 651079360370c7bbf950da1f873928a28be02b96..a6f2ffa14ea8da332b73d103d6c1616c12e8ef0d 100644 (file)
--- 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 cc1e24fa3ca89a43a1abfa72330848c7e07a0e1a..7410c1005d3754ddf41289b50c9281421f247e16 100644 (file)
--- 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);