From 031e5cce385d3f96b1caa1d53495332a7eb03749 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Tue, 23 Mar 2021 23:49:46 +0000
Subject: New upstream version 15.3

---
 Cryptlib/Cryptlib.diff | 68 +++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 42 deletions(-)

(limited to 'Cryptlib/Cryptlib.diff')

diff --git a/Cryptlib/Cryptlib.diff b/Cryptlib/Cryptlib.diff
index 5a56470d..a2f49d67 100644
--- a/Cryptlib/Cryptlib.diff
+++ b/Cryptlib/Cryptlib.diff
@@ -1,20 +1,8 @@
-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
+index 68bc25a..1abe78e 100644
 --- a/Cryptlib/SysCall/BaseMemAllocation.c
 +++ b/Cryptlib/SysCall/BaseMemAllocation.c
-@@ -33,7 +33,7 @@ void *realloc (void *ptr, size_t size)
+@@ -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.
    //
@@ -23,33 +11,8 @@ index f390e0d..65e9938 100644
  }
  
  /* 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
+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.
@@ -57,12 +20,12 @@ index 581b8fb..04fe4ef 100644
  **/
  
 -#include <Uefi.h>
- #include <CrtLibSupport.h>
+ #include <OpenSslSupport.h>
 -#include <Library/UefiRuntimeServicesTableLib.h>
  
  //
  // -- Time Management Routines --
-@@ -79,7 +77,7 @@ time_t time (time_t *timer)
+@@ -78,7 +76,7 @@ time_t time (time_t *timer)
    //
    // Get the current time and date information
    //
@@ -71,3 +34,24 @@ index 581b8fb..04fe4ef 100644
  
    //
    // 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;
-- 
cgit v1.2.3