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 10e68f010f2a5a7125625588e78110844ec87fb1..c6cf33ce16345922ed6e194402d2464d6cbe5ba7 100644 (file)
--- 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 507c6094d6b85d1dd898094ffa1f5ca8e87f3acd..0cbfd9c0c9169ca9ae27c17183fd27ca76c3131d 100644 (file)
--- 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