Fix CrytoPkg issue in GCC X64 tip.

[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / EDKII_openssl-0.9.8l.patch

diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8l.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8l.patch
index 231ec6e23a5a43698b28076edad29b0d49329fff..d14b08e770887f2740af105d5719d5bb279c067e 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8l.patch
+++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-0.9.8l.patch
@@ -24,6 +24,59 @@
  #endif /* OPENSSL_NO_STDIO */\r
  \r
  #endif /* HEADER_BSS_FILE_C */\r
+--- crypto/err/err.c\r
++++ crypto/err/err.c\r
+@@ -313,7 +313,12 @@\r
+       es->err_data_flags[i]=flags;\r
+       }\r
+ \r
++/* Add EFIAPI for UEFI version. */\r
++#if defined(OPENSSL_SYS_UEFI)\r
++void EFIAPI ERR_add_error_data(int num, ...)\r
++#else\r
+ void ERR_add_error_data(int num, ...)\r
++#endif\r
+       {\r
+       va_list args;\r
+       int i,n,s;\r
+--- crypto/err/err.h\r
++++ crypto/err/err.h\r
+@@ -286,8 +286,14 @@\r
+ #endif\r
+ #ifndef OPENSSL_NO_BIO\r
+ void ERR_print_errors(BIO *bp);\r
++\r
++/* Add EFIAPI for UEFI version. */\r
++#if defined(OPENSSL_SYS_UEFI)\r
++void EFIAPI ERR_add_error_data(int num, ...);\r
++#else\r
+ void ERR_add_error_data(int num, ...);\r
+ #endif\r
++#endif\r
+ void ERR_load_strings(int lib,ERR_STRING_DATA str[]);\r
+ void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);\r
+ void ERR_load_ERR_strings(void);\r
+--- crypto/opensslconf.h\r
++++ crypto/opensslconf.h\r
+@@ -162,6 +162,9 @@\r
+ /* The prime number generation stuff may not work when\r
+  * EIGHT_BIT but I don't care since I've only used this mode\r
+  * for debuging the bignum libraries */\r
++\r
++/* Bypass following definition for UEFI version. */\r
++#if !defined(OPENSSL_SYS_UEFI)\r
+ #undef SIXTY_FOUR_BIT_LONG\r
+ #undef SIXTY_FOUR_BIT\r
+ #define THIRTY_TWO_BIT\r
+@@ -169,6 +172,8 @@\r
+ #undef EIGHT_BIT\r
+ #endif\r
+ \r
++#endif\r
++\r
+ #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)\r
+ #define CONFIG_HEADER_RC4_LOCL_H\r
+ /* if this is defined data[i] is used instead of *data, this is a %20\r
 --- crypto/pkcs7/pk7_smime.c   2009-03-15 21:36:02.000000000 +0800\r
 +++ crypto/pkcs7/pk7_smime.c   2011-09-13 14:11:36.019454700 +0800\r
 @@ -88,7 +88,10 @@\r