From: Pauli Date: Sun, 22 Sep 2019 00:45:07 +0000 (+1000) Subject: Remove engine param from the settable list X-Git-Tag: openssl-3.0.0-alpha1~1288 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5053a3766a13f40afb3c89f54d1f9a5eae38a3eb;p=oweals%2Fopenssl.git Remove engine param from the settable list Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9971) --- diff --git a/providers/common/macs/cmac_prov.c b/providers/common/macs/cmac_prov.c index aee0b2bb0a..c01b2f87ad 100644 --- a/providers/common/macs/cmac_prov.c +++ b/providers/common/macs/cmac_prov.c @@ -136,7 +136,6 @@ static int cmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_CIPHER, NULL, 0), - OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_ENGINE, NULL, 0), OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_PROPERTIES, NULL, 0), OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), OSSL_PARAM_END diff --git a/providers/common/macs/gmac_prov.c b/providers/common/macs/gmac_prov.c index 67f3e48407..3d81af8766 100644 --- a/providers/common/macs/gmac_prov.c +++ b/providers/common/macs/gmac_prov.c @@ -153,7 +153,6 @@ static int gmac_get_params(OSSL_PARAM params[]) static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_CIPHER, NULL, 0), - OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_ENGINE, NULL, 0), OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_PROPERTIES, NULL, 0), OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), OSSL_PARAM_octet_string(OSSL_MAC_PARAM_IV, NULL, 0), diff --git a/providers/common/macs/hmac_prov.c b/providers/common/macs/hmac_prov.c index 64d6dd9dc9..e9d7647ce2 100644 --- a/providers/common/macs/hmac_prov.c +++ b/providers/common/macs/hmac_prov.c @@ -150,7 +150,6 @@ static int hmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_DIGEST, NULL, 0), - OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_ENGINE, NULL, 0), OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_PROPERTIES, NULL, 0), OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), OSSL_PARAM_int(OSSL_MAC_PARAM_FLAGS, NULL),