summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2022-06-22 15:08:18 +0200
committerTomas Mraz <tomas@openssl.org>2022-06-24 08:25:26 +0200
commitb07db93f6b38aaea8b131f7dcfba7ad7386196d2 (patch)
treea9bd497f172093e98099c3dd3f5009129a6928fe
parent665ab12ed3f0d78e7cb6a55cdd2b83a2fe150232 (diff)
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)
-rw-r--r--crypto/provider_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 0ada85d214..2acfc0429c 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"