Remove engine param from the settable list
authorPauli <paul.dale@oracle.com>
Sun, 22 Sep 2019 00:45:07 +0000 (10:45 +1000)
committerPauli <paul.dale@oracle.com>
Wed, 25 Sep 2019 01:20:41 +0000 (11:20 +1000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9971)

providers/common/macs/cmac_prov.c
providers/common/macs/gmac_prov.c
providers/common/macs/hmac_prov.c

index aee0b2bb0ab0600628a7d9f7d2a4e5663de8485f..c01b2f87ad32ff4653952104cfc004b9827c21db 100644 (file)
@@ -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
index 67f3e484071190c1b06a8ac32312ab73d4da4265..3d81af8766d6164ea14982d9c5975f1ce043768a 100644 (file)
@@ -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),
index 64d6dd9dc92c001c4f51fa5e215bd99f9daad5a3..e9d7647ce22c2fe63f48779f2f3bdb5007650f13 100644 (file)
@@ -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),