CryptoPkg/OpensslLib: Regenerate OpenSSL patch

All the OpenSSL changes we carry in our EDKII_openssl patch for 1.0.2
are now merged into upstream OpenSSL and will be in the upcoming 1.1
release.

As a first step towards switching out our original hacks for backported
versions of the commits which were actually accepted into OpenSSL 1.1,
just regenerate the *existing* patch against the 1.0.2f release using
'git diff'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Qin Long <qin.long@intel.com>
Tested-by: Qin Long <qin.long@intel.com>

2 files changed, 159 insertions, 146 deletions

diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch
index 541ef45a56..edd2425b11 100644
--- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch
+++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2f.patch
@@ -1,7 +1,8 @@
-diff U3 crypto/bio/bio.h crypto/bio/bio.h

---- crypto/bio/bio.h	Thu Jan 28 21:56:08 2016

-+++ crypto/bio/bio.h	Wed Feb 17 16:43:40 2016

-@@ -650,10 +650,10 @@

+diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h

+index 6e2293b..325e5d2 100644

+--- a/crypto/bio/bio.h

++++ b/crypto/bio/bio.h

+@@ -650,10 +650,10 @@ int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,

  int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,

                          asn1_ps_func **psuffix_free);

  

@@ -13,10 +14,11 @@ diff U3 crypto/bio/bio.h crypto/bio/bio.h
  #  define BIO_s_file_internal    BIO_s_file

  # endif

  BIO *BIO_new(BIO_METHOD *type);

-diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c

---- crypto/bio/bss_file.c	Thu Jan 28 21:38:30 2016

-+++ crypto/bio/bss_file.c	Wed Feb 17 16:01:02 2016

-@@ -467,6 +467,23 @@

+diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c

+index bfba93e..4f13d1b 100644

+--- a/crypto/bio/bss_file.c

++++ b/crypto/bio/bss_file.c

+@@ -467,6 +467,23 @@ static int MS_CALLBACK file_puts(BIO *bp, const char *str)

      return (ret);

  }

  

@@ -40,10 +42,97 @@ diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c
  # endif                         /* OPENSSL_NO_STDIO */

  

  #endif                          /* HEADER_BSS_FILE_C */

-diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c

---- crypto/dh/dh_pmeth.c	Thu Jan 28 21:56:08 2016

-+++ crypto/dh/dh_pmeth.c	Wed Feb 17 16:15:58 2016

-@@ -449,6 +449,9 @@

+diff --git a/crypto/crypto.h b/crypto/crypto.h

+index c450d7a..d6e804e 100644

+--- a/crypto/crypto.h

++++ b/crypto/crypto.h

+@@ -235,15 +235,15 @@ typedef struct openssl_item_st {

+ # ifndef OPENSSL_NO_LOCKING

+ #  ifndef CRYPTO_w_lock

+ #   define CRYPTO_w_lock(type)     \

+-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

++        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0)

+ #   define CRYPTO_w_unlock(type)   \

+-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

++        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0)

+ #   define CRYPTO_r_lock(type)     \

+-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)

++        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0)

+ #   define CRYPTO_r_unlock(type)   \

+-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)

++        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0)

+ #   define CRYPTO_add(addr,amount,type)    \

+-        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)

++        CRYPTO_add_lock(addr,amount,type,NULL,0)

+ #  endif

+ # else

+ #  define CRYPTO_w_lock(a)

+@@ -378,19 +378,19 @@ int CRYPTO_is_mem_check_on(void);

+ # define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)

+ # define is_MemCheck_on() CRYPTO_is_mem_check_on()

+ 

+-# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)

+-# define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)

++# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,NULL,0)

++# define OPENSSL_strdup(str)     CRYPTO_strdup((str),NULL,0)

+ # define OPENSSL_realloc(addr,num) \

+-        CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)

++        CRYPTO_realloc((char *)addr,(int)num,NULL,0)

+ # define OPENSSL_realloc_clean(addr,old_num,num) \

+-        CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)

++        CRYPTO_realloc_clean(addr,old_num,num,NULL,0)

+ # define OPENSSL_remalloc(addr,num) \

+-        CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)

++        CRYPTO_remalloc((char **)addr,(int)num,NULL,0)

+ # define OPENSSL_freeFunc        CRYPTO_free

+ # define OPENSSL_free(addr)      CRYPTO_free(addr)

+ 

+ # define OPENSSL_malloc_locked(num) \

+-        CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)

++        CRYPTO_malloc_locked((int)num,NULL,0)

+ # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)

+ 

+ const char *SSLeay_version(int type);

+@@ -545,7 +545,7 @@ void CRYPTO_set_mem_debug_options(long bits);

+ long CRYPTO_get_mem_debug_options(void);

+ 

+ # define CRYPTO_push_info(info) \

+-        CRYPTO_push_info_(info, __FILE__, __LINE__);

++        CRYPTO_push_info_(info, NULL, 0);

+ int CRYPTO_push_info_(const char *info, const char *file, int line);

+ int CRYPTO_pop_info(void);

+ int CRYPTO_remove_all_info(void);

+@@ -588,7 +588,7 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);

+ 

+ /* die if we have to */

+ void OpenSSLDie(const char *file, int line, const char *assertion);

+-# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))

++# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(NULL, 0, #e),1))

+ 

+ unsigned long *OPENSSL_ia32cap_loc(void);

+ # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))

+@@ -605,14 +605,14 @@ void OPENSSL_init(void);

+ #  define fips_md_init_ctx(alg, cx) \

+         int alg##_Init(cx##_CTX *c) \

+         { \

+-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \

++        if (FIPS_mode()) OpenSSLDie(NULL, 0, \

+                 "Low level API call to digest " #alg " forbidden in FIPS mode!"); \

+         return private_##alg##_Init(c); \

+         } \

+         int private_##alg##_Init(cx##_CTX *c)

+ 

+ #  define fips_cipher_abort(alg) \

+-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \

++        if (FIPS_mode()) OpenSSLDie(NULL, 0, \

+                 "Low level API call to cipher " #alg " forbidden in FIPS mode!")

+ 

+ # else

+diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c

+index b58e3fa..e5f345a 100644

+--- a/crypto/dh/dh_pmeth.c

++++ b/crypto/dh/dh_pmeth.c

+@@ -449,6 +449,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,

          *keylen = ret;

          return 1;

      } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {

@@ -53,7 +142,7 @@ diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c
          unsigned char *Z = NULL;

          size_t Zlen = 0;

          if (!dctx->kdf_outlen || !dctx->kdf_oid)

-@@ -478,6 +481,7 @@

+@@ -478,6 +481,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,

              OPENSSL_free(Z);

          }

          return ret;

@@ -61,10 +150,11 @@ diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c
      }

      return 1;

  }

-diff U3 crypto/pem/pem.h crypto/pem/pem.h

---- crypto/pem/pem.h	Thu Jan 28 21:56:08 2016

-+++ crypto/pem/pem.h	Wed Feb 17 15:56:26 2016

-@@ -324,6 +324,7 @@

+diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h

+index d3b23fc..d61605b 100644

+--- a/crypto/pem/pem.h

++++ b/crypto/pem/pem.h

+@@ -324,6 +324,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \

  

  #  define DECLARE_PEM_read_fp(name, type) /**/

  #  define DECLARE_PEM_write_fp(name, type) /**/

@@ -72,10 +162,11 @@ diff U3 crypto/pem/pem.h crypto/pem/pem.h
  #  define DECLARE_PEM_write_cb_fp(name, type) /**/

  # else

  

-diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c

---- crypto/pkcs7/pk7_smime.c	Thu Jan 28 21:56:08 2016

-+++ crypto/pkcs7/pk7_smime.c	Wed Feb 17 16:22:45 2016

-@@ -254,7 +254,8 @@

+diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c

+index c4d3724..0996c39 100644

+--- a/crypto/pkcs7/pk7_smime.c

++++ b/crypto/pkcs7/pk7_smime.c

+@@ -254,7 +254,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,

      STACK_OF(PKCS7_SIGNER_INFO) *sinfos;

      PKCS7_SIGNER_INFO *si;

      X509_STORE_CTX cert_ctx;

@@ -85,7 +176,7 @@ diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
      int i, j = 0, k, ret = 0;

      BIO *p7bio = NULL;

      BIO *tmpin = NULL, *tmpout = NULL;

-@@ -275,12 +276,6 @@

+@@ -275,12 +276,6 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,

          return 0;

      }

  

@@ -98,7 +189,7 @@ diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
      sinfos = PKCS7_get_signer_info(p7);

  

      if (!sinfos || !sk_PKCS7_SIGNER_INFO_num(sinfos)) {

-@@ -355,9 +350,14 @@

+@@ -355,9 +350,14 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,

      } else

          tmpout = out;

  

@@ -114,7 +205,7 @@ diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
          if (i <= 0)

              break;

          if (tmpout)

-@@ -394,6 +394,9 @@

+@@ -394,6 +394,9 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,

      }

      BIO_free_all(p7bio);

      sk_X509_free(signers);

@@ -124,9 +215,10 @@ diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c
      return ret;

  }

  

-diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c

---- crypto/rand/rand_unix.c	Thu Jan 28 21:38:32 2016

-+++ crypto/rand/rand_unix.c	Wed Feb 17 15:40:02 2016

+diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c

+index 266111e..f60fac6 100644

+--- a/crypto/rand/rand_unix.c

++++ b/crypto/rand/rand_unix.c

 @@ -116,7 +116,7 @@

  #include <openssl/rand.h>

  #include "rand_lcl.h"

@@ -136,7 +228,7 @@ diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c
  

  # include <sys/types.h>

  # include <sys/time.h>

-@@ -439,7 +439,7 @@

+@@ -439,7 +439,7 @@ int RAND_poll(void)

                                   * defined(OPENSSL_SYS_VXWORKS) ||

                                   * defined(OPENSSL_SYS_NETWARE)) */

  

@@ -145,9 +237,10 @@ diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c
  int RAND_poll(void)

  {

      return 0;

-diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c

---- crypto/rsa/rsa_ameth.c	Thu Jan 28 21:56:08 2016

-+++ crypto/rsa/rsa_ameth.c	Wed Feb 17 15:09:46 2016

+diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c

+index 4e06218..f591f0f 100644

+--- a/crypto/rsa/rsa_ameth.c

++++ b/crypto/rsa/rsa_ameth.c

 @@ -68,10 +68,12 @@

  #endif

  #include "asn1_locl.h"

@@ -161,7 +254,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  

  static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)

  {

-@@ -665,6 +667,7 @@

+@@ -665,6 +667,7 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,

      return rv;

  }

  

@@ -169,7 +262,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  static int rsa_cms_verify(CMS_SignerInfo *si)

  {

      int nid, nid2;

-@@ -683,6 +686,7 @@

+@@ -683,6 +686,7 @@ static int rsa_cms_verify(CMS_SignerInfo *si)

      }

      return 0;

  }

@@ -177,7 +270,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  

  /*

   * Customised RSA item verification routine. This is called when a signature

-@@ -705,6 +709,7 @@

+@@ -705,6 +709,7 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,

      return -1;

  }

  

@@ -185,7 +278,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  static int rsa_cms_sign(CMS_SignerInfo *si)

  {

      int pad_mode = RSA_PKCS1_PADDING;

-@@ -729,6 +734,7 @@

+@@ -729,6 +734,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si)

      X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os);

      return 1;

  }

@@ -193,7 +286,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  

  static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,

                           X509_ALGOR *alg1, X509_ALGOR *alg2,

-@@ -785,6 +791,7 @@

+@@ -785,6 +791,7 @@ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg,

      return pss;

  }

  

@@ -201,7 +294,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  static int rsa_cms_decrypt(CMS_RecipientInfo *ri)

  {

      EVP_PKEY_CTX *pkctx;

-@@ -857,7 +864,9 @@

+@@ -857,7 +864,9 @@ static int rsa_cms_decrypt(CMS_RecipientInfo *ri)

          X509_ALGOR_free(maskHash);

      return rv;

  }

@@ -211,7 +304,7 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  static int rsa_cms_encrypt(CMS_RecipientInfo *ri)

  {

      const EVP_MD *md, *mgf1md;

-@@ -920,6 +929,7 @@

+@@ -920,6 +929,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)

          ASN1_STRING_free(os);

      return rv;

  }

@@ -219,10 +312,11 @@ diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c
  

  const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {

      {

-diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c

---- crypto/x509/x509_vfy.c	Thu Jan 28 21:56:08 2016

-+++ crypto/x509/x509_vfy.c	Wed Feb 17 16:09:58 2016

-@@ -940,6 +940,8 @@

+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c

+index 0429767..7ddc21c 100644

+--- a/crypto/x509/x509_vfy.c

++++ b/crypto/x509/x509_vfy.c

+@@ -940,6 +940,8 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)

          ctx->current_crl = crl;

      if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)

          ptime = &ctx->param->check_time;

@@ -231,7 +325,7 @@ diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c
      else

          ptime = NULL;

  

-@@ -1663,6 +1665,8 @@

+@@ -1663,6 +1665,8 @@ static int check_cert_time(X509_STORE_CTX *ctx, X509 *x)

  

      if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)

          ptime = &ctx->param->check_time;

@@ -240,10 +334,11 @@ diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c
      else

          ptime = NULL;

  

-diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h

---- crypto/x509/x509_vfy.h	Thu Jan 28 21:56:08 2016

-+++ crypto/x509/x509_vfy.h	Wed Feb 17 16:08:18 2016

-@@ -438,6 +438,8 @@

+diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h

+index 2663e1c..98d0b4c 100644

+--- a/crypto/x509/x509_vfy.h

++++ b/crypto/x509/x509_vfy.h

+@@ -438,6 +438,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);

   * will force the behaviour to match that of previous versions.

   */

  # define X509_V_FLAG_NO_ALT_CHAINS               0x100000

@@ -252,10 +347,11 @@ diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h
  

  # define X509_VP_FLAG_DEFAULT                    0x1

  # define X509_VP_FLAG_OVERWRITE                  0x2

-diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h

---- crypto/x509v3/ext_dat.h	Thu Jan 28 21:56:08 2016

-+++ crypto/x509v3/ext_dat.h	Wed Feb 17 16:13:30 2016

-@@ -127,8 +127,10 @@

+diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h

+index c3a6fce..01edd2a 100644

+--- a/crypto/x509v3/ext_dat.h

++++ b/crypto/x509v3/ext_dat.h

+@@ -127,8 +127,10 @@ static const X509V3_EXT_METHOD *standard_exts[] = {

      &v3_idp,

      &v3_alt[2],

      &v3_freshest_crl,

@@ -266,95 +362,11 @@ diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h
  };

  

  /* Number of standard extensions */

-diff U3 crypto/crypto.h crypto/crypto.h

---- crypto/crypto.h	Thu Jan 28 21:38:30 2016

-+++ crypto/crypto.h	Wed Feb 17 16:33:00 2016

-@@ -235,15 +235,15 @@

- # ifndef OPENSSL_NO_LOCKING

- #  ifndef CRYPTO_w_lock

- #   define CRYPTO_w_lock(type)     \

--        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

-+        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0)

- #   define CRYPTO_w_unlock(type)   \

--        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

-+        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0)

- #   define CRYPTO_r_lock(type)     \

--        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)

-+        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0)

- #   define CRYPTO_r_unlock(type)   \

--        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)

-+        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0)

- #   define CRYPTO_add(addr,amount,type)    \

--        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)

-+        CRYPTO_add_lock(addr,amount,type,NULL,0)

- #  endif

- # else

- #  define CRYPTO_w_lock(a)

-@@ -378,19 +378,19 @@

- # define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)

- # define is_MemCheck_on() CRYPTO_is_mem_check_on()

- 

--# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)

--# define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)

-+# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,NULL,0)

-+# define OPENSSL_strdup(str)     CRYPTO_strdup((str),NULL,0)

- # define OPENSSL_realloc(addr,num) \

--        CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)

-+        CRYPTO_realloc((char *)addr,(int)num,NULL,0)

- # define OPENSSL_realloc_clean(addr,old_num,num) \

--        CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)

-+        CRYPTO_realloc_clean(addr,old_num,num,NULL,0)

- # define OPENSSL_remalloc(addr,num) \

--        CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)

-+        CRYPTO_remalloc((char **)addr,(int)num,NULL,0)

- # define OPENSSL_freeFunc        CRYPTO_free

- # define OPENSSL_free(addr)      CRYPTO_free(addr)

- 

- # define OPENSSL_malloc_locked(num) \

--        CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)

-+        CRYPTO_malloc_locked((int)num,NULL,0)

- # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)

- 

- const char *SSLeay_version(int type);

-@@ -545,7 +545,7 @@

- long CRYPTO_get_mem_debug_options(void);

- 

- # define CRYPTO_push_info(info) \

--        CRYPTO_push_info_(info, __FILE__, __LINE__);

-+        CRYPTO_push_info_(info, NULL, 0);

- int CRYPTO_push_info_(const char *info, const char *file, int line);

- int CRYPTO_pop_info(void);

- int CRYPTO_remove_all_info(void);

-@@ -588,7 +588,7 @@

- 

- /* die if we have to */

- void OpenSSLDie(const char *file, int line, const char *assertion);

--# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))

-+# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(NULL, 0, #e),1))

- 

- unsigned long *OPENSSL_ia32cap_loc(void);

- # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))

-@@ -605,14 +605,14 @@

- #  define fips_md_init_ctx(alg, cx) \

-         int alg##_Init(cx##_CTX *c) \

-         { \

--        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \

-+        if (FIPS_mode()) OpenSSLDie(NULL, 0, \

-                 "Low level API call to digest " #alg " forbidden in FIPS mode!"); \

-         return private_##alg##_Init(c); \

-         } \

-         int private_##alg##_Init(cx##_CTX *c)

- 

- #  define fips_cipher_abort(alg) \

--        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \

-+        if (FIPS_mode()) OpenSSLDie(NULL, 0, \

-                 "Low level API call to cipher " #alg " forbidden in FIPS mode!")

- 

- # else

-diff U3 e_os.h e_os.h

---- e_os.h	Thu Jan 28 21:56:08 2016

-+++ e_os.h	Wed Feb 17 15:52:08 2016

-@@ -136,7 +136,7 @@

+diff --git a/e_os.h b/e_os.h

+index 1fa36c1..3e9dae2 100644

+--- a/e_os.h

++++ b/e_os.h

+@@ -136,7 +136,7 @@ extern "C" {

  #  define MSDOS

  # endif

  

@@ -363,10 +375,11 @@ diff U3 e_os.h e_os.h
  #  define GETPID_IS_MEANINGLESS

  # endif

  

-diff U3 e_os2.h e_os2.h

---- e_os2.h	Thu Jan 28 21:56:08 2016

-+++ e_os2.h	Wed Feb 17 15:53:08 2016

-@@ -97,7 +97,14 @@

+diff --git a/e_os2.h b/e_os2.h

+index 7be9989..909e22f 100644

+--- a/e_os2.h

++++ b/e_os2.h

+@@ -97,7 +97,14 @@ extern "C" {

   * For 32 bit environment, there seems to be the CygWin environment and then

   * all the others that try to do the same thing Microsoft does...

   */

diff --git a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt
index 433f626c65..7803949d54 100644
--- a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt
+++ b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt
@@ -46,7 +46,7 @@ cryptography. This patch will enable openssl building under UEFI environment.
        Install Cygwin or get the patch utility binary from

           http://gnuwin32.sourceforge.net/packages/patch.htm

     2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-1.0.2f

-    3) patch -p0 -i ..\EDKII_openssl-1.0.2f.patch

+    3) patch -p1 -i ..\EDKII_openssl-1.0.2f.patch

     4) cd ..

     5) Install.cmd

 

@@ -55,7 +55,7 @@ cryptography. This patch will enable openssl building under UEFI environment.
     1) Make sure the patch utility has been installed in your machine.

        Patch utility is available from http://directory.fsf.org/project/patch/

     2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-1.0.2f

-    3) patch -p0 -i ../EDKII_openssl-1.0.2f.patch

+    3) patch -p1 -i ../EDKII_openssl-1.0.2f.patch

     4) cd ..

     5) ./Install.sh