Include e_os.h in a few cases (to pick up

str(n)icmp defs).

Disable a few tests if not FIPS.

diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c
index c4c534d0cd575fa0378cf5c67513cc7b9aba9be9..532586a496ca33a89617505d5710a1205cea5cb4 100644 (file)
--- a/fips/aes/fips_aesavs.c
+++ b/fips/aes/fips_aesavs.c
@@ -19,6 +19,7 @@
 #include <openssl/evp.h>
 #include <openssl/fips.h>
 #include <openssl/err.h>
+#include "../e_os.h"
 
 #define AES_BLOCK_SIZE 16
 

diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index 8bb5dc6fdd4f460798661d9d6dfc4a2c8da1495e..db44b8a6e44c55482c3d89d680ccbb7592cc1e88 100644 (file)
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -20,6 +20,7 @@
 #include <openssl/evp.h>
 #include <openssl/fips.h>
 #include <openssl/err.h>
+#include "../e_os.h"
 
 /*#define AES_BLOCK_SIZE 16*/
 

diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c
index 53dc8d881a77a91a3668d3a777606ab11dfe523c..224535ed4daa319aef9413a6371ce3695fdd5e5a 100644 (file)
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -74,10 +74,10 @@
 #include <openssl/fips.h>
 #include <openssl/fips_rand.h>
 
-#ifdef OPENSSL_NO_DSA
+#if defined(OPENSSL_NO_DSA) && !defined(OPENSSL_FIPS)
 int main(int argc, char *argv[])
 {
-    printf("No DSA support\n");
+    printf("No FIPS DSA support\n");
     return(0);
 }
 #else

diff --git a/fips/rand/fips_randtest.c b/fips/rand/fips_randtest.c
index c84653eb1d40acd3b16b99c4f8079c9d88808513..ca47ca4ad9edb0d0523d0ea21c1c62f287086cbe 100644 (file)
--- a/fips/rand/fips_randtest.c
+++ b/fips/rand/fips_randtest.c
@@ -110,6 +110,15 @@
 
 #include "../e_os.h"
 
+#ifndef OPENSSL_FIPS
+int main(int argc, char *argv[])
+{
+    printf("No FIPS RAND support\n");
+    return(0);
+}
+
+#else
+
 /* some FIPS 140-1 random number test */
 /* some simple tests */
 
@@ -346,3 +355,5 @@ int main()
        EXIT(err);
        return(err);
        }
+
+#endif