From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 8 Sep 2003 17:01:48 +0000 (+0000)
Subject: Put #ifdef FIPS round FIPS DSA_generate_parameters .
X-Git-Tag: BEN_FIPS_TEST_1~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31b28f95be1b11efe37d1b8ad2ef3b944fb55c87;p=oweals%2Fopenssl.git

Put #ifdef FIPS round FIPS DSA_generate_parameters .
#if 0 unimplemented ciphers so mkdef.pl doesn't pick
them up.
---

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 10e68f010f..c6cf33ce16 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -644,8 +644,10 @@ const EVP_CIPHER *EVP_des_cfb1(void);
 const EVP_CIPHER *EVP_des_cfb8(void);
 const EVP_CIPHER *EVP_des_ede_cfb64(void);
 # define EVP_des_ede_cfb EVP_des_ede_cfb64
+#if 0
 const EVP_CIPHER *EVP_des_ede_cfb1(void);
 const EVP_CIPHER *EVP_des_ede_cfb8(void);
+#endif
 const EVP_CIPHER *EVP_des_ede3_cfb64(void);
 # define EVP_des_ede3_cfb EVP_des_ede3_cfb64
 const EVP_CIPHER *EVP_des_ede3_cfb1(void);
diff --git a/fips/dsa/fips_dsa_gen.c b/fips/dsa/fips_dsa_gen.c
index 507c6094d6..0cbfd9c0c9 100644
--- a/fips/dsa/fips_dsa_gen.c
+++ b/fips/dsa/fips_dsa_gen.c
@@ -71,6 +71,8 @@
 
 #ifndef OPENSSL_NO_SHA
 
+#ifdef FIPS
+
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -297,3 +299,5 @@ err:
 	return(ok?ret:NULL);
 	}
 #endif
+
+#endif