Revert lots of Cryptlib updates.

OpenSSL changes quite a bit of the key validation, and most of the keys
I can find in the wild aren't marked as trusted by the new checker.

Intel noticed this too: https://github.com/vathpela/edk2/commit/f536d7c3ed
but instead of fixing the compatibility error, they switched their test
data to match the bug.

So that's pretty broken.

For now, I'm reverting OpenSSL 1.1.0e, because we need those certs in
the wild to work.

This reverts commit 513cbe2aea689bf968f171f894f3d4cdb43524d5.
This reverts commit e9cc33d6f2b7f35c6f5e349fd83fb9ae0bc66226.
This reverts commit 80d49f758ead0180bfe6161931838e0578248303.
This reverts commit 9bc647e2b23bcfd69a0077c0717fbc454c919a57.
This reverts commit ae75df6232ad30f3e8736e9449692d58a7439260.
This reverts commit e883479f35644d17db7efed710657c8543cfcb68.
This reverts commit 97469449fda5ba933a64280917e776487301a127.
This reverts commit e39692647f78e13d757ddbfdd36f440d5f526050.
This reverts commit 0f3dfc01e2d5e7df882c963dd8dc4a0dfbfc96ad.
This reverts commit 4da6ac819510c7cc4ba21d7a735d69b45daa5873.
This reverts commit d064bd7eef201f26cb926450a76260b5187ac689.
This reverts commit 9bc86cfd6f9387f0da9d5c0102b6aa5627e91c91.
This reverts commit ab9a05a10f16b33f7ee1e9da360c7801eebdb9d2.

Signed-off-by: Peter Jones <pjones@redhat.com>

1 files changed, 26 insertions, 42 deletions

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;