New upstream version 15+1533136590.3beb971

[efi-boot-shim.git] / Cryptlib / Cryptlib.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\r
   // memory size of original pointer ptr.\r
   //\r
-  return ReallocatePool ((UINTN) size, (UINTN) size, ptr);\r
+  return ReallocatePool (ptr, (UINTN) size, (UINTN) size);\r
 }\r
 \r
 /* De-allocates or frees a memory block */\r
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;\r
 }\r
 \r
-//\r
-//  -- Dummy OpenSSL Support Routines --\r
-//\r
-\r
-int BIO_printf (void *bio, const char *format, ...)\r
-{\r
-  return 0;\r
-}\r
-\r
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)\r
-{\r
-  return 0;\r
-}\r
-\r
 #ifdef __GNUC__\r
 \r
 typedef\r
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.
 \r
 **/\r
 \r
-#include <Uefi.h>\r
 #include <CrtLibSupport.h>\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
 \r
 //\r
 // -- Time Management Routines --\r
@@ -79,7 +77,7 @@ time_t time (time_t *timer)
   //\r
   // Get the current time and date information\r
   //\r
-  gRT->GetTime (&Time, NULL);\r
+  uefi_call_wrapper(RT->GetTime, 2, &Time, NULL);\r
 \r
   //\r
   // Years Handling\r