From: Aidan Khoury <aidan@revers.engineering>
Date: Tue, 11 Apr 2023 15:31:57 +0000 (-0300)
Subject: Fix UEFI support on win32
X-Git-Tag: openssl-3.2.0-alpha1~1011
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0e090bd61d2e46a1d8f60f39f10152c87e87753;p=thirdparty%2Fopenssl.git

Fix UEFI support on win32

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20714)
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index b722d2bb5fd..1b1830f31aa 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -12,7 +12,7 @@
 #include "crypto/cryptlib.h"
 #include <openssl/safestack.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
 # include <tchar.h>
 # include <signal.h>
 # ifdef __WATCOMC__
@@ -256,7 +256,7 @@ void OPENSSL_die(const char *message, const char *file, int line)
 {
     OPENSSL_showfatal("%s:%d: OpenSSL internal error: %s\n",
                       file, line, message);
-#if !defined(_WIN32)
+#if !defined(_WIN32) || defined(OPENSSL_SYS_UEFI)
     abort();
 #else
     /*
diff --git a/crypto/sleep.c b/crypto/sleep.c
index 3eac44dd748..95d6c792335 100644
--- a/crypto/sleep.c
+++ b/crypto/sleep.c
@@ -39,7 +39,7 @@ void OSSL_sleep(uint64_t millis)
     usleep(millis * 1000);
 # endif
 }
-#elif defined(_WIN32)
+#elif defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
 # include <windows.h>
 
 void OSSL_sleep(uint64_t millis)
diff --git a/crypto/time.c b/crypto/time.c
index a90aa767881..4e7d3eebac7 100644
--- a/crypto/time.c
+++ b/crypto/time.c
@@ -15,7 +15,7 @@ OSSL_TIME ossl_time_now(void)
 {
     OSSL_TIME r;
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
     SYSTEMTIME st;
     union {
         unsigned __int64 ul;