summaryrefslogtreecommitdiffstats
path: root/providers/common
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-09-11 10:17:00 +0100
committerMatt Caswell <matt@openssl.org>2019-09-12 10:14:18 +0100
commit252a3665e4c24a387e86ff4e07159f8e846adebc (patch)
tree1312f63ff45101d20b6ed4e2084ba6015a3f1ead /providers/common
parent8d0f8c818117132a38005a046f0daacd1219e217 (diff)
Fix no-engine
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9863)
Diffstat (limited to 'providers/common')
-rw-r--r--providers/common/provider_util.c3
1 files changed, 2 insertions, 1 deletions
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)