remove ossl_prov_cipher_load_from_params()

This function is no longer used or needed and it's internal so it can be
removed safely.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/28333)

diff --git a/providers/common/include/prov/provider_util.h b/providers/common/include/prov/provider_util.h
index 4060992b4a09b1ae15e511bb88c0dfe0508bccc9..e29a1d4ce2bc60b127f98e9a2afb68b21cc49094 100644 (file)
--- a/providers/common/include/prov/provider_util.h
+++ b/providers/common/include/prov/provider_util.h
@@ -39,13 +39,10 @@ typedef struct {
 /* Cipher functions */
 /*
  * Load a cipher from the specified parameters with the specified context.
- * The params "properties", "engine" and "cipher" are used to determine the
+ * The params "propq", "engine" and "cipher" are used to determine the
  * implementation used.  If a provider cannot be found, it falls back to trying
  * non-provider based implementations.
  */
-int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc,
-                                      const OSSL_PARAM params[],
-                                      OSSL_LIB_CTX *ctx);
 int ossl_prov_cipher_load(PROV_CIPHER *pc, const OSSL_PARAM *cipher,
                           const OSSL_PARAM *propq, const OSSL_PARAM *engine,
                           OSSL_LIB_CTX *ctx);

diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c
index 40b1aa81bed48b75e031ecaf423b49b1d855e7d8..ee4b4cd38463c570720e1a096ebcbdfe3f54523e 100644 (file)
--- a/providers/common/provider_util.c
+++ b/providers/common/provider_util.c
@@ -121,17 +121,6 @@ int ossl_prov_cipher_load(PROV_CIPHER *pc, const OSSL_PARAM *cipher,
         ERR_clear_last_mark();
     return pc->cipher != NULL;
 }
-                            
-int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc,
-                                      const OSSL_PARAM params[],
-                                      OSSL_LIB_CTX *ctx)
-{
-     return ossl_prov_cipher_load(pc,
-                                  OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_CIPHER),
-                                  OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_PROPERTIES),
-                                  OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_ENGINE),
-                                  ctx);
-}
 
 const EVP_CIPHER *ossl_prov_cipher_cipher(const PROV_CIPHER *pc)
 {