From 4d4928edd0758753e43294816ae6095975a6e5fa Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 8 Feb 2021 17:25:41 +0100 Subject: [PATCH] EVP: make evp_pkey_is_assigned() usable in the FIPS module Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/13913) --- include/crypto/evp.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 2a92a1e5331..b0e82f6c818 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -598,8 +598,13 @@ DEFINE_STACK_OF(OP_CACHE_ELEM) ((pk)->type == EVP_PKEY_NONE && (pk)->keymgmt == NULL) #define evp_pkey_is_typed(pk) \ ((pk)->type != EVP_PKEY_NONE || (pk)->keymgmt != NULL) -#define evp_pkey_is_assigned(pk) \ +#ifndef FIPS_MODULE +# define evp_pkey_is_assigned(pk) \ ((pk)->pkey.ptr != NULL || (pk)->keydata != NULL) +#else +# define evp_pkey_is_assigned(pk) \ + ((pk)->keydata != NULL) +#endif #define evp_pkey_is_legacy(pk) \ ((pk)->type != EVP_PKEY_NONE && (pk)->keymgmt == NULL) #define evp_pkey_is_provided(pk) \ -- 2.47.3