From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 22 Jun 2022 13:08:18 +0000 (+0200)
Subject: Avoid including decoder/encoder/store headers into fips module
X-Git-Tag: openssl-3.2.0-alpha1~2484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8fd15a8dc50020360862290ace7f34b6ef0e92d;p=thirdparty%2Fopenssl.git

Avoid including decoder/encoder/store headers into fips module

Fixes #18618

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18630)

(cherry picked from commit b07db93f6b38aaea8b131f7dcfba7ad7386196d2)
---

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index cacc2c4a6a3..072e29e0237 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -15,10 +15,12 @@
 #include <openssl/params.h>
 #include <openssl/opensslv.h>
 #include "crypto/cryptlib.h"
+#ifndef FIPS_MODULE
 #include "crypto/decoder.h" /* ossl_decoder_store_cache_flush */
 #include "crypto/encoder.h" /* ossl_encoder_store_cache_flush */
-#include "crypto/evp.h" /* evp_method_store_cache_flush */
 #include "crypto/store.h" /* ossl_store_loader_store_cache_flush */
+#endif
+#include "crypto/evp.h" /* evp_method_store_cache_flush */
 #include "crypto/rand.h"
 #include "internal/nelem.h"
 #include "internal/thread_once.h"