mirror of
https://git.proxmox.com/git/efi-boot-shim
synced 2025-10-31 12:59:56 +00:00
9bc86cfd6f
- Remove the openssl version from update.sh since edk2 doesn't use the version number in the directory name anymore. - Refresh Cryptlib.diff to reflect the change Signed-off-by: Gary Lin <glin@suse.com>
74 lines
2.1 KiB
Diff
74 lines
2.1 KiB
Diff
diff --git a/Cryptlib/Include/openssl/e_os2.h b/Cryptlib/Include/openssl/e_os2.h
|
|
index 99ea347..f11cffe 100644
|
|
--- a/Cryptlib/Include/openssl/e_os2.h
|
|
+++ b/Cryptlib/Include/openssl/e_os2.h
|
|
@@ -234,6 +234,7 @@ extern "C" {
|
|
|
|
/* Standard integer types */
|
|
# if defined(OPENSSL_SYS_UEFI)
|
|
+#include <efi.h>
|
|
typedef INT8 int8_t;
|
|
typedef UINT8 uint8_t;
|
|
typedef INT16 int16_t;
|
|
diff --git a/Cryptlib/SysCall/BaseMemAllocation.c b/Cryptlib/SysCall/BaseMemAllocation.c
|
|
index f390e0d..65e9938 100644
|
|
--- a/Cryptlib/SysCall/BaseMemAllocation.c
|
|
+++ b/Cryptlib/SysCall/BaseMemAllocation.c
|
|
@@ -33,7 +33,7 @@ void *realloc (void *ptr, size_t size)
|
|
// BUG: hardcode OldSize == size! We have no any knowledge about
|
|
// memory size of original pointer ptr.
|
|
//
|
|
- return ReallocatePool ((UINTN) size, (UINTN) size, ptr);
|
|
+ return ReallocatePool (ptr, (UINTN) size, (UINTN) size);
|
|
}
|
|
|
|
/* De-allocates or frees a memory block */
|
|
diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c
|
|
index 20c9656..7878953 100644
|
|
--- a/Cryptlib/SysCall/CrtWrapper.c
|
|
+++ b/Cryptlib/SysCall/CrtWrapper.c
|
|
@@ -371,20 +371,6 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
|
|
return 0;
|
|
}
|
|
|
|
-//
|
|
-// -- Dummy OpenSSL Support Routines --
|
|
-//
|
|
-
|
|
-int BIO_printf (void *bio, const char *format, ...)
|
|
-{
|
|
- return 0;
|
|
-}
|
|
-
|
|
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
|
|
-{
|
|
- return 0;
|
|
-}
|
|
-
|
|
#ifdef __GNUC__
|
|
|
|
typedef
|
|
diff --git a/Cryptlib/SysCall/TimerWrapper.c b/Cryptlib/SysCall/TimerWrapper.c
|
|
index 581b8fb..04fe4ef 100644
|
|
--- a/Cryptlib/SysCall/TimerWrapper.c
|
|
+++ b/Cryptlib/SysCall/TimerWrapper.c
|
|
@@ -13,9 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
|
|
**/
|
|
|
|
-#include <Uefi.h>
|
|
#include <CrtLibSupport.h>
|
|
-#include <Library/UefiRuntimeServicesTableLib.h>
|
|
|
|
//
|
|
// -- Time Management Routines --
|
|
@@ -79,7 +77,7 @@ time_t time (time_t *timer)
|
|
//
|
|
// Get the current time and date information
|
|
//
|
|
- gRT->GetTime (&Time, NULL);
|
|
+ uefi_call_wrapper(RT->GetTime, 2, &Time, NULL);
|
|
|
|
//
|
|
// Years Handling
|