From b07db93f6b38aaea8b131f7dcfba7ad7386196d2 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 22 Jun 2022 15:08:18 +0200 Subject: [PATCH] Avoid including decoder/encoder/store headers into fips module Fixes #18618 Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/18630) --- crypto/provider_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 #include #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"