From 252a3665e4c24a387e86ff4e07159f8e846adebc Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 11 Sep 2019 10:17:00 +0100 Subject: [PATCH] Fix no-engine Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9863) --- providers/common/provider_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index babbfffd3d..92cfb749c0 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -44,7 +44,8 @@ static int load_common(const OSSL_PARAM params[], const char **propquery, *engine = NULL; /* TODO legacy stuff, to be removed */ -#ifndef FIPS_MODE /* Inside the FIPS module, we don't support legacy ciphers */ + /* 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); if (p != NULL) { if (p->data_type != OSSL_PARAM_UTF8_STRING) -- 2.25.1