From: Qin Long <qin.long@intel.com>
Date: Wed, 15 Mar 2017 15:33:57 +0000 (+0800)
Subject: Cleaning UEFI Build with additional OPENSSL_SYS_UEFI flags
X-Git-Tag: OpenSSL_1_1_1-pre1~1918
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fopenssl.git;a=commitdiff_plain;h=cff55b90e95e1fa6c90154f93f12363e761d88c7

Cleaning UEFI Build with additional OPENSSL_SYS_UEFI flags

Add OPENSSL_SYS_UEFI to remove unused syslog and uid stuffs for
more clean UEFI build.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2961)
---

diff --git a/crypto/uid.c b/crypto/uid.c
index 9756d51850..4e1890f2d2 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -19,7 +19,7 @@ int OPENSSL_issetugid(void)
     return issetugid();
 }
 
-#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS)
+#elif defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 
 int OPENSSL_issetugid(void)
 {
diff --git a/e_os.h b/e_os.h
index f255aa9c22..241e0bac54 100644
--- a/e_os.h
+++ b/e_os.h
@@ -87,7 +87,7 @@ extern "C" {
 #  define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
 # endif
 
-# if defined(OPENSSL_SYS_VXWORKS)
+# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 #  define NO_SYS_PARAM_H
 #  define NO_CHMOD
 #  define NO_SYSLOG