Use OPENSSL_FIPS instead of FIPS.

fips/dsa/fips_dsa_gen.c

@@ -84,7 +84,7 @@
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 
-#ifdef FIPS
+#ifdef OPENSSL_FIPS
 
 DSA *DSA_generate_parameters(int bits,
 		unsigned char *seed_in, int seed_len,

fips/dsa/fips_dsa_ossl.c

@@ -68,7 +68,7 @@
 #endif
 #include <openssl/fips.h>
 
-#ifdef FIPS
+#ifdef OPENSSL_FIPS
 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
 static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
@@ -367,8 +367,8 @@ static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
 	return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
 }
 
-#else /* ndef FIPS */
+#else /* ndef OPENSSL_FIPS */
 
 static void *dummy=&dummy;
 
-#endif /* ndef FIPS */
+#endif /* ndef OPENSSL_FIPS */

fips/dsa/fips_dsatest.c

@@ -74,7 +74,7 @@
 #include <openssl/fips.h>
 #include <openssl/fips_rand.h>
 
-#if defined(OPENSSL_NO_DSA) || !defined(FIPS)
+#if defined(OPENSSL_NO_DSA) || !defined(OPENSSL_FIPS)
 int main(int argc, char *argv[])
 {
     printf("No FIPS DSA support\n");
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
 	if (bio_err == NULL)
 		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
-#ifdef FIPS
+#ifdef OPENSSL_FIPS
 	if(!FIPS_mode_set(1,argv[0]))
 	    {
 	    ERR_print_errors(bio_err);