diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-22 10:43:08 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-25 11:20:41 +1000 |
| commit | 69db30449ee1f75d2be74c91d6f15b8322a2b824 (patch) | |
| tree | 6055d148de24a9fc472aa9842274885f07d73850 | |
| parent | 38cfb11d47a6f8c1cbfcdb69f7e10f928521d250 (diff) | |
Remove engine param macros from wrapper APIs
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9971)
| -rw-r--r-- | crypto/evp/p_lib.c | 3 | ||||
| -rw-r--r-- | crypto/evp/pkey_mac.c | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 5ec519d27c..83cf12fff3 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -344,8 +344,7 @@ EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv, # ifndef OPENSSL_NO_ENGINE if (engine_id != NULL) params[paramsn++] = - OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_ENGINE, - (char *)engine_id, 0); + OSSL_PARAM_construct_utf8_string("engine", (char *)engine_id, 0); # endif params[paramsn++] = diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c index 1343e19e76..5f33b4e421 100644 --- a/crypto/evp/pkey_mac.c +++ b/crypto/evp/pkey_mac.c @@ -278,8 +278,7 @@ static int pkey_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) char *engineid = (char *)ENGINE_get_id(ctx->engine); params[params_n++] = - OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_ENGINE, - engineid, 0); + OSSL_PARAM_construct_utf8_string("engine", engineid, 0); #endif params[params_n++] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER, @@ -400,11 +399,9 @@ static int pkey_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) char *engineid = ctx->engine == NULL ? NULL : (char *)ENGINE_get_id(ctx->engine); - if (engineid != NULL) { + if (engineid != NULL) params[params_n++] = - OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_ENGINE, - engineid, 0); - } + OSSL_PARAM_construct_utf8_string("engine", engineid, 0); #endif params[params_n++] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, |