Skip to content

Commit dc7bf31

Browse files
paulidalenhorman
authored andcommitted
macctx: remove unused function
The `ossl_prov_macctx_load_from_params()` function is no longer used. Since it isn't public, it can be removed. Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from openssl#29013)
1 parent 8752f7f commit dc7bf31

2 files changed

Lines changed: 0 additions & 40 deletions

File tree

providers/common/include/prov/provider_util.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -108,30 +108,6 @@ int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
108108
const char *properties,
109109
const OSSL_PARAM param[]);
110110

111-
/* MAC functions */
112-
/*
113-
* Load an EVP_MAC_CTX* from the specified parameters with the specified
114-
* library context.
115-
* The params "mac" and "properties" are used to determine the implementation
116-
* used, and the parameters "digest", "cipher", "engine" and "properties" are
117-
* passed to the MAC via the created MAC context if they are given.
118-
* If there is already a created MAC context, it will be replaced if the "mac"
119-
* parameter is found, otherwise it will simply be used as is, and passed the
120-
* parameters to pilfer as it sees fit.
121-
*
122-
* As an option, a MAC name may be explicitly given, and if it is, the "mac"
123-
* parameter will be ignored.
124-
* Similarly, as an option, a cipher name or a digest name may be explicitly
125-
* given, and if any of them is, the "digest" and "cipher" parameters are
126-
* ignored.
127-
*/
128-
int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
129-
const OSSL_PARAM params[],
130-
const char *macname,
131-
const char *ciphername,
132-
const char *mdname,
133-
OSSL_LIB_CTX *ctx);
134-
135111
typedef struct ag_capable_st {
136112
OSSL_ALGORITHM alg;
137113
int (*capable)(void);

providers/common/provider_util.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -323,22 +323,6 @@ int ossl_prov_macctx_load(EVP_MAC_CTX **macctx,
323323
return 0;
324324
}
325325

326-
int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
327-
const OSSL_PARAM params[],
328-
const char *macname,
329-
const char *ciphername,
330-
const char *mdname,
331-
OSSL_LIB_CTX *libctx)
332-
{
333-
return ossl_prov_macctx_load
334-
(macctx, OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_MAC),
335-
OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_CIPHER),
336-
OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_DIGEST),
337-
OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_PROPERTIES),
338-
OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_ENGINE),
339-
macname, ciphername, mdname, libctx);
340-
}
341-
342326
void ossl_prov_cache_exported_algorithms(const OSSL_ALGORITHM_CAPABLE *in,
343327
OSSL_ALGORITHM *out)
344328
{

0 commit comments

Comments
 (0)