From a7d64957b992cffd230e2a088d0d6b6964f4fffd Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 5 Sep 2003 14:09:40 +0000
Subject: [PATCH] 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...
---
 fips/des/fingerprint.sha1  | 2 +-
 fips/des/fips_des_locl.h   | 2 +-
 fips/rand/fingerprint.sha1 | 2 +-
 fips/rand/fips_rand.c      | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/fips/des/fingerprint.sha1 b/fips/des/fingerprint.sha1
index 555b9e1384..ea283abc46 100644
--- 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 e44e8e98b2..ef9323a6d6 100644
--- 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 3192109c61..ed11643a76 100644
--- 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 f88bb605a9..6e1fed07cc 100644
--- 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
-- 
2.25.1