From 27bc1029147af163e7bd3bbba271c226f1950171 Mon Sep 17 00:00:00 2001 From: Pauli Date: Thu, 28 Aug 2025 14:50:50 +1000 Subject: [PATCH] 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 Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/28333) --- providers/common/include/prov/provider_util.h | 5 +---- providers/common/provider_util.c | 11 ----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/providers/common/include/prov/provider_util.h b/providers/common/include/prov/provider_util.h index 4060992b4a0..e29a1d4ce2b 100644 --- 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 40b1aa81bed..ee4b4cd3846 100644 --- 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) { -- 2.47.3