From: Richard Levitte <levitte@openssl.org>
Date: Tue, 9 Sep 2003 16:38:16 +0000 (+0000)
Subject: Move the FIPS check so make depend doesn't give different results
X-Git-Tag: BEN_FIPS_TEST_1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3446728f9829d62bf7cc08537a1a1681a8f6bfe;p=openssl

Move the FIPS check so make depend doesn't give different results
depending on FIPS mode.
---

diff --git a/fips/dsa/fips_dsa_gen.c b/fips/dsa/fips_dsa_gen.c
index 0cbfd9c0c9..34f389790f 100644
--- a/fips/dsa/fips_dsa_gen.c
+++ b/fips/dsa/fips_dsa_gen.c
@@ -69,20 +69,23 @@
 #define HASH    EVP_sha1()
 #endif 
 
-#ifndef OPENSSL_NO_SHA
-
-#ifdef FIPS
-
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 /*#include "cryptlib.h"*/
 #include <openssl/evp.h>
 #include <openssl/bn.h>
+#ifndef OPENSSL_NO_SHA
 #include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_RAND
 #include <openssl/rand.h>
+#endif
+#ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 
+#ifdef FIPS
+
 DSA *DSA_generate_parameters(int bits,
 		unsigned char *seed_in, int seed_len,
 		int *counter_ret, unsigned long *h_ret,