CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8zf.patch

   1 Index: crypto/bio/bss_file.c
   2 ===================================================================
   3 --- crypto/bio/bss_file.c       (revision 1)
   4 +++ crypto/bio/bss_file.c       (working copy)
   5 @@ -418,6 +418,23 @@
   6      return (ret);
   7  }
   8
   9 +#else
  10 +
  11 +BIO_METHOD *BIO_s_file(void)
  12 +{
  13 +    return NULL;
  14 +}
  15 +
  16 +BIO *BIO_new_file(const char *filename, const char *mode)
  17 +{
  18 +    return NULL;
  19 +}
  20 +
  21 +BIO *BIO_new_fp(FILE *stream, int close_flag)
  22 +{
  23 +    return NULL;
  24 +}
  25 +
  26  # endif                         /* OPENSSL_NO_STDIO */
  27
  28  #endif                          /* HEADER_BSS_FILE_C */
  29 Index: crypto/crypto.h
  30 ===================================================================
  31 --- crypto/crypto.h     (revision 1)
  32 +++ crypto/crypto.h     (working copy)
  33 @@ -239,15 +239,15 @@
  34  # ifndef OPENSSL_NO_LOCKING
  35  #  ifndef CRYPTO_w_lock
  36  #   define CRYPTO_w_lock(type)     \
  37 -        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
  38 +        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0)
  39  #   define CRYPTO_w_unlock(type)   \
  40 -        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
  41 +        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0)
  42  #   define CRYPTO_r_lock(type)     \
  43 -        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
  44 +        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0)
  45  #   define CRYPTO_r_unlock(type)   \
  46 -        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
  47 +        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0)
  48  #   define CRYPTO_add(addr,amount,type)    \
  49 -        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
  50 +        CRYPTO_add_lock(addr,amount,type,NULL,0)
  51  #  endif
  52  # else
  53  #  define CRYPTO_w_lock(a)
  54 @@ -374,19 +374,19 @@
  55  # define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
  56  # define is_MemCheck_on() CRYPTO_is_mem_check_on()
  57
  58 -# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)
  59 -# define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)
  60 +# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,NULL,0)
  61 +# define OPENSSL_strdup(str)     CRYPTO_strdup((str),NULL,0)
  62  # define OPENSSL_realloc(addr,num) \
  63 -        CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)
  64 +        CRYPTO_realloc((char *)addr,(int)num,NULL,0)
  65  # define OPENSSL_realloc_clean(addr,old_num,num) \
  66 -        CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)
  67 +        CRYPTO_realloc_clean(addr,old_num,num,NULL,0)
  68  # define OPENSSL_remalloc(addr,num) \
  69 -        CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
  70 +        CRYPTO_remalloc((char **)addr,(int)num,NULL,0)
  71  # define OPENSSL_freeFunc        CRYPTO_free
  72  # define OPENSSL_free(addr)      CRYPTO_free(addr)
  73
  74  # define OPENSSL_malloc_locked(num) \
  75 -        CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)
  76 +        CRYPTO_malloc_locked((int)num,NULL,0)
  77  # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)
  78
  79  const char *SSLeay_version(int type);
  80 @@ -531,7 +531,7 @@
  81  long CRYPTO_get_mem_debug_options(void);
  82
  83  # define CRYPTO_push_info(info) \
  84 -        CRYPTO_push_info_(info, __FILE__, __LINE__);
  85 +        CRYPTO_push_info_(info, NULL, 0);
  86  int CRYPTO_push_info_(const char *info, const char *file, int line);
  87  int CRYPTO_pop_info(void);
  88  int CRYPTO_remove_all_info(void);
  89 @@ -578,7 +578,7 @@
  90
  91  /* die if we have to */
  92  void OpenSSLDie(const char *file, int line, const char *assertion);
  93 -# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
  94 +# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(NULL, 0, #e),1))
  95
  96  unsigned long *OPENSSL_ia32cap_loc(void);
  97  # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
  98 @@ -585,10 +585,10 @@
  99  int OPENSSL_isservice(void);
 100
 101  # ifdef OPENSSL_FIPS
 102 -#  define FIPS_ERROR_IGNORED(alg) OpenSSLDie(__FILE__, __LINE__, \
 103 +#  define FIPS_ERROR_IGNORED(alg) OpenSSLDie(NULL, 0, \
 104                  alg " previous FIPS forbidden algorithm error ignored");
 105
 106 -#  define FIPS_BAD_ABORT(alg) OpenSSLDie(__FILE__, __LINE__, \
 107 +#  define FIPS_BAD_ABORT(alg) OpenSSLDie(NULL, 0, \
 108                  #alg " Algorithm forbidden in FIPS mode");
 109
 110  #  ifdef OPENSSL_FIPS_STRICT
 111 Index: crypto/err/err.c
 112 ===================================================================
 113 --- crypto/err/err.c    (revision 1)
 114 +++ crypto/err/err.c    (working copy)
 115 @@ -321,7 +321,12 @@
 116      es->err_data_flags[i] = flags;
 117  }
 118
 119 +/* Add EFIAPI for UEFI version. */
 120 +#if defined(OPENSSL_SYS_UEFI)
 121 +void EFIAPI ERR_add_error_data(int num, ...)
 122 +#else
 123  void ERR_add_error_data(int num, ...)
 124 +#endif
 125  {
 126      va_list args;
 127      int i, n, s;
 128 Index: crypto/err/err.h
 129 ===================================================================
 130 --- crypto/err/err.h    (revision 1)
 131 +++ crypto/err/err.h    (working copy)
 132 @@ -285,7 +285,13 @@
 133  # endif
 134  # ifndef OPENSSL_NO_BIO
 135  void ERR_print_errors(BIO *bp);
 136 +
 137 +/* Add EFIAPI for UEFI version. */
 138 +#if defined(OPENSSL_SYS_UEFI)
 139 +void EFIAPI ERR_add_error_data(int num, ...);
 140 +#else
 141  void ERR_add_error_data(int num, ...);
 142 +#endif
 143  # endif
 144  void ERR_load_strings(int lib, ERR_STRING_DATA str[]);
 145  void ERR_unload_strings(int lib, ERR_STRING_DATA str[]);
 146 Index: crypto/opensslconf.h
 147 ===================================================================
 148 --- crypto/opensslconf.h        (revision 1)
 149 +++ crypto/opensslconf.h        (working copy)
 150 @@ -162,6 +162,9 @@
 151  /* The prime number generation stuff may not work when
 152   * EIGHT_BIT but I don't care since I've only used this mode
 153   * for debuging the bignum libraries */
 154 +
 155 +/* Bypass following definition for UEFI version. */
 156 +#if !defined(OPENSSL_SYS_UEFI)
 157  #undef SIXTY_FOUR_BIT_LONG
 158  #undef SIXTY_FOUR_BIT
 159  #define THIRTY_TWO_BIT
 160 @@ -169,6 +172,8 @@
 161  #undef EIGHT_BIT
 162  #endif
 163
 164 +#endif
 165 +
 166  #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
 167  #define CONFIG_HEADER_RC4_LOCL_H
 168  /* if this is defined data[i] is used instead of *data, this is a %20
 169 Index: crypto/pkcs7/pk7_smime.c
 170 ===================================================================
 171 --- crypto/pkcs7/pk7_smime.c    (revision 1)
 172 +++ crypto/pkcs7/pk7_smime.c    (working copy)
 173 @@ -90,7 +90,14 @@
 174      if (!PKCS7_content_new(p7, NID_pkcs7_data))
 175          goto err;
 176
 177 +#if defined(OPENSSL_SYS_UEFI)
 178 +    /*
 179 +     * NOTE: Update to SHA-256 digest algorithm for UEFI version.
 180 +     */
 181 +    if (!(si = PKCS7_add_signature(p7, signcert, pkey, EVP_sha256()))) {
 182 +#else
 183      if (!(si = PKCS7_add_signature(p7, signcert, pkey, EVP_sha1()))) {
 184 +#endif
 185          PKCS7err(PKCS7_F_PKCS7_SIGN, PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR);
 186          goto err;
 187      }
 188 @@ -175,7 +182,8 @@
 189      STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
 190      PKCS7_SIGNER_INFO *si;
 191      X509_STORE_CTX cert_ctx;
 192 -    char buf[4096];
 193 +    char *buf = NULL;
 194 +    int bufsiz;
 195      int i, j = 0, k, ret = 0;
 196      BIO *p7bio;
 197      BIO *tmpin, *tmpout;
 198 @@ -286,6 +294,12 @@
 199      } else
 200          tmpout = out;
 201
 202 +    bufsiz = 4096;
 203 +    buf = OPENSSL_malloc (bufsiz);
 204 +    if (buf == NULL) {
 205 +      goto err;
 206 +    }
 207 +
 208      /* We now have to 'read' from p7bio to calculate digests etc. */
 209      for (;;) {
 210          i = BIO_read(p7bio, buf, sizeof(buf));
 211 @@ -328,6 +342,10 @@
 212
 213      sk_X509_free(signers);
 214
 215 +    if (buf != NULL) {
 216 +      OPENSSL_free (buf);
 217 +    }
 218 +
 219      return ret;
 220  }
 221
 222 Index: crypto/rand/rand_egd.c
 223 ===================================================================
 224 --- crypto/rand/rand_egd.c      (revision 1)
 225 +++ crypto/rand/rand_egd.c      (working copy)
 226 @@ -95,7 +95,7 @@
 227   *   RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255.
 228   */
 229
 230 -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS)
 231 +#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) || defined(OPENSSL_SYS_UEFI)
 232  int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
 233  {
 234      return (-1);
 235 Index: crypto/rand/rand_unix.c
 236 ===================================================================
 237 --- crypto/rand/rand_unix.c     (revision 1)
 238 +++ crypto/rand/rand_unix.c     (working copy)
 239 @@ -116,7 +116,7 @@
 240  #include <openssl/rand.h>
 241  #include "rand_lcl.h"
 242
 243 -#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE))
 244 +#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_UEFI))
 245
 246  # include <sys/types.h>
 247  # include <sys/time.h>
 248 @@ -332,7 +332,7 @@
 249                                   * defined(OPENSSL_SYS_VXWORKS) ||
 250                                   * defined(OPENSSL_SYS_NETWARE)) */
 251
 252 -#if defined(OPENSSL_SYS_VXWORKS)
 253 +#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 254  int RAND_poll(void)
 255  {
 256      return 0;
 257 Index: crypto/x509/x509_vfy.c
 258 ===================================================================
 259 --- crypto/x509/x509_vfy.c      (revision 1)
 260 +++ crypto/x509/x509_vfy.c      (working copy)
 261 @@ -871,6 +871,10 @@
 262
 263  static int check_cert_time(X509_STORE_CTX *ctx, X509 *x)
 264  {
 265 +#if defined(OPENSSL_SYS_UEFI)
 266 +  /* Bypass Certificate Time Checking for UEFI version. */
 267 +  return 1;
 268 +#else
 269      time_t *ptime;
 270      int i;
 271
 272 @@ -910,6 +914,7 @@
 273      }
 274
 275      return 1;
 276 +#endif
 277  }
 278
 279  static int internal_verify(X509_STORE_CTX *ctx)