Mask new fips_*vs test programs in non-fips builds.

diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index 5c751669817091ac19ddc9c5e638d50b15094c63..cbf0a819816471a0543a0b345833300019b721b3 100644 (file)
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -1,3 +1,15 @@
+#include <openssl/opensslconf.h>
+
+#ifndef OPENSSL_FIPS
+#include <stdio.h>
+
+int main()
+{
+    printf("No FIPS DSA support\n");
+    return(0);
+}
+#else
+
 #include <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/fips.h>
@@ -304,3 +316,4 @@ int main(int argc,char **argv)
 
     return 0;
     }
+#endif

diff --git a/fips/rand/fips_rngvs.c b/fips/rand/fips_rngvs.c
index e6166645524aeb7253b7fc71d87e3c9b1972cb83..2e7053368a98ce16ca99026fec69a0ff8961a55e 100644 (file)
--- a/fips/rand/fips_rngvs.c
+++ b/fips/rand/fips_rngvs.c
@@ -6,6 +6,16 @@
  * NIST document "The Random Number Generator Validation System (RNGVS)", May 25, 2004.\r
  *\r
 */\r
+#include <openssl/opensslconf.h>\r
+\r
+#ifndef OPENSSL_FIPS\r
+#include <stdio.h>\r
+int main()\r
+{\r
+    printf("No FIPS RNG support\n");\r
+    exit(0);\r
+}\r
+#else\r
 \r
 #include <openssl/bn.h>\r
 #include <openssl/dsa.h>\r
@@ -220,3 +230,4 @@ int main(int argc,char **argv)
 \r
     return 0;\r
     }\r
+#endif\r