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 b722d2bb5fd7c3dfedf6e3ace22bc7309571aa6d..1b1830f31aa7a804607dcb8e710e1f1b2a1675aa 100644 (file)
--- 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 3eac44dd748a44bd1d22cc7322485ec4209a87bb..95d6c7923351fc6f4e91de4dcb1cd975f5b16056 100644 (file)
--- 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 a90aa767881e68e1cac3dae7e982b19767134604..4e7d3eebac7f8ca4c116f806bc4121ff2b0e0c74 100644 (file)
--- 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;