Include "e_os.h" instead of "../e_os.h", and trust the building

procedure to give the correct -I options to the compiler.  This is
*especially* true for test programs that appear in two places, with
different paths to e_os.h depending on where they are built.

diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c
index 532586a496ca33a89617505d5710a1205cea5cb4..5ffbb086c141fc9331f4a61f3b9209725e194b00 100644 (file)
--- a/fips/aes/fips_aesavs.c
+++ b/fips/aes/fips_aesavs.c
@@ -19,7 +19,7 @@
 #include <openssl/evp.h>
 #include <openssl/fips.h>
 #include <openssl/err.h>
-#include "../e_os.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 db44b8a6e44c55482c3d89d680ccbb7592cc1e88..177cff26e0db173eb1b72b7ba81dfd1435171a84 100644 (file)
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -20,7 +20,7 @@
 #include <openssl/evp.h>
 #include <openssl/fips.h>
 #include <openssl/err.h>
-#include "../e_os.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 7a54d38c789758b3ead5d940b444fc0551eb665f..8fc4d01fc0746908826d991f51b0bb2211efc8c6 100644 (file)
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -62,7 +62,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../e_os.h"
+#include "e_os.h"
 
 #include <openssl/crypto.h>
 #include <openssl/rand.h>

diff --git a/fips/rand/fips_randtest.c b/fips/rand/fips_randtest.c
index 5fcee19d5247632393e956a839be031aa916d19e..011678a5a5af605153c22e88f9e74451b9b8f5a0 100644 (file)
--- a/fips/rand/fips_randtest.c
+++ b/fips/rand/fips_randtest.c
@@ -108,7 +108,7 @@
 #include <openssl/rand.h>
 #include <openssl/fips_rand.h>
 
-#include "../e_os.h"
+#include "e_os.h"
 
 #ifndef FIPS
 int main(int argc, char *argv[])