From: Matt Caswell <matt@openssl.org>
Date: Wed, 11 Sep 2019 09:17:00 +0000 (+0100)
Subject: Fix no-engine
X-Git-Tag: openssl-3.0.0-alpha1~1388
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=252a3665e4c24a387e86ff4e07159f8e846adebc;p=oweals%2Fopenssl.git

Fix no-engine

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9863)
---

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)