Fix UEFI support on win32

Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #20714)
openssl · Apr 13, 2023 · c0e090b · c0e090b
1 parent 51b941a
commit c0e090b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;