diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-22 02:39:17 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-25 03:20:41 +0200 |
| commit | 38cfb11d47a6f8c1cbfcdb69f7e10f928521d250 (patch) | |
| tree | 82596846b6d842ca27a153741245f3db1aeb72cc /providers/common/provider_util.c | |
| parent | Add rc4 cipher to default provider (diff) | |
| download | openssl-38cfb11d47a6f8c1cbfcdb69f7e10f928521d250.tar.xz openssl-38cfb11d47a6f8c1cbfcdb69f7e10f928521d250.zip | |
Make the "engine" parameter to some provider algorithms (KDF/PRF) hidden.
This parameter will disappear once engines are wrapped by a provider so
it shouldn't ever be visible to the public.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9971)
Diffstat (limited to '')
| -rw-r--r-- | providers/common/provider_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index 796d00d376..8384cdc2a0 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -46,7 +46,7 @@ static int load_common(const OSSL_PARAM params[], const char **propquery, /* TODO legacy stuff, to be removed */ /* Inside the FIPS module, we don't support legacy ciphers */ #if !defined(FIPS_MODE) && !defined(OPENSSL_NO_ENGINE) - p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_ENGINE); + p = OSSL_PARAM_locate_const(params, "engine"); if (p != NULL) { if (p->data_type != OSSL_PARAM_UTF8_STRING) return 0; @@ -221,10 +221,10 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx, (char *)properties, 0); #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODE) - if ((p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_ENGINE)) != NULL) { + if ((p = OSSL_PARAM_locate_const(params, "engine")) != NULL) { if (p->data_type != OSSL_PARAM_UTF8_STRING) return 0; - *mp++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_ENGINE, + *mp++ = OSSL_PARAM_construct_utf8_string("engine", p->data, p->data_size); } #endif |