diff options
| author | Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> | 2017-08-04 12:10:50 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> | 2017-08-04 12:10:50 -0400 |
| commit | bbfd2ab18f52600aa41f061b2da9a2afe2a9d6ac (patch) | |
| tree | 56132d617fff7c4f05e67024ec872d88fcafa92d /Cryptlib/Cryptlib.diff | |
| download | efi-boot-shim-upstream/0.9+1474479173.6c180c6.tar.gz efi-boot-shim-upstream/0.9+1474479173.6c180c6.zip | |
Import Upstream version 0.9+1474479173.6c180c6upstream/0.9+1474479173.6c180c6
Diffstat (limited to 'Cryptlib/Cryptlib.diff')
| -rw-r--r-- | Cryptlib/Cryptlib.diff | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/Cryptlib/Cryptlib.diff b/Cryptlib/Cryptlib.diff new file mode 100644 index 00000000..a2f49d67 --- /dev/null +++ b/Cryptlib/Cryptlib.diff @@ -0,0 +1,57 @@ +diff --git a/Cryptlib/SysCall/BaseMemAllocation.c b/Cryptlib/SysCall/BaseMemAllocation.c +index 68bc25a..1abe78e 100644 +--- a/Cryptlib/SysCall/BaseMemAllocation.c ++++ b/Cryptlib/SysCall/BaseMemAllocation.c +@@ -32,7 +32,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/TimerWrapper.c b/Cryptlib/SysCall/TimerWrapper.c +index 805e6b4..bb7bcba 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 <OpenSslSupport.h>
+-#include <Library/UefiRuntimeServicesTableLib.h>
+
+ //
+ // -- Time Management Routines --
+@@ -78,7 +76,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
+diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c +index fb446b6..5a8322d 100644 +--- a/Cryptlib/SysCall/CrtWrapper.c ++++ b/Cryptlib/SysCall/CrtWrapper.c +@@ -293,16 +293,6 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream) + // -- 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;
+-}
+-
+ void *UI_OpenSSL(void)
+ {
+ return NULL;
|