Include e_os.h to get the proper definition of OPENSSL_UNISTD, and use

that macro.

It's possible that OPENSSL_UNISTD_IO should be used instead of
OPENSSL_UNISTD, for the MSDOS case...

diff --git a/fips/des/fingerprint.sha1 b/fips/des/fingerprint.sha1
index 555b9e1384c804aa84be49b661963363ed2b313a..ea283abc46b8ff80b2892f798fb903cbd2100f05 100644 (file)
--- a/fips/des/fingerprint.sha1
+++ b/fips/des/fingerprint.sha1
@@ -1,3 +1,3 @@
 SHA1(fips_des_enc.c)= a4b88bb16782604a298d74de04a8b3bc3a204c5a
 SHA1(fips_des_selftest.c)= f516832dcb9c49c20adc35c14e2b00ed0ebd36b2
-SHA1(fips_des_locl.h)= 5e5128f074485e72d6fdee00d22d46a694bd5abe
+SHA1(fips_des_locl.h)= a4cf60ca32476a2483b3e4460ec9a19c0444fd20

diff --git a/fips/des/fips_des_locl.h b/fips/des/fips_des_locl.h
index e44e8e98b25041b6278676de98e0c67ba57d5e22..ef9323a6d67c3d10413969b772d492f9a61dca75 100644 (file)
--- a/fips/des/fips_des_locl.h
+++ b/fips/des/fips_des_locl.h
@@ -59,7 +59,7 @@
 #ifndef HEADER_DES_LOCL_H
 #define HEADER_DES_LOCL_H
 
-#include <openssl/e_os2.h>
+#include "e_os.h"
 
 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
 #ifndef OPENSSL_SYS_MSDOS

diff --git a/fips/rand/fingerprint.sha1 b/fips/rand/fingerprint.sha1
index 3192109c61f443c881094d38ab8b35104aa28b39..ed11643a76eefeca97a370203d05577df1639af3 100644 (file)
--- a/fips/rand/fingerprint.sha1
+++ b/fips/rand/fingerprint.sha1
@@ -1,2 +1,2 @@
-SHA1(fips_rand.c)= 14f651281d84cdca50e4d155557b68c9d1b5cbb4
+SHA1(fips_rand.c)= 76d532a78471404825bb7b718307dcc7cdfbf30f
 SHA1(fips_rand.h)= da5ee76588070c97d47c939d069d250a1476a080

diff --git a/fips/rand/fips_rand.c b/fips/rand/fips_rand.c
index f88bb605a90bb061e13e02e358520f76ff76ec60..6e1fed07ccb3822433809fba32ca19abf94376ff 100644 (file)
--- a/fips/rand/fips_rand.c
+++ b/fips/rand/fips_rand.c
@@ -56,9 +56,14 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/fips_rand.h>
+#include "e_os.h"
 #include <sys/time.h>
 #include <assert.h>
-#include <unistd.h>
+#ifdef OPENSSL_UNISTD
+# include OPENSSL_UNISTD
+#else
+# include <unistd.h>
+#endif
 #include <string.h>
 
 #define SEED_SIZE      8