CryptoPkg: OpensslLib: reintroduce EFIAPI for ERR_add_error_data()

[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / EDKII_openssl-1.0.2c.patch

diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2c.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2c.patch
index 54e14d8af99d0f8c285ac50359c6d40008f56757..0d9575e94aef2b07250ff66f1dcaf44ec3ad5c9f 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2c.patch
+++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2c.patch
@@ -344,3 +344,37 @@ diff U3 crypto/opensslconf.h crypto/opensslconf.h
  #endif\r
  \r
  #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)\r
+diff U3 crypto/err/err.c crypto/err/err.c\r
+--- crypto/err/err.c\r
++++ crypto/err/err.c\r
+@@ -1072,7 +1072,12 @@ void ERR_set_error_data(char *data, int flags)\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
+     va_start(args, num);\r
+diff U3 crypto/err/err.h crypto/err/err.h\r
+--- crypto/err/err.h\r
++++ crypto/err/err.h\r
+@@ -344,7 +344,14 @@ void ERR_print_errors_fp(FILE *fp);\r
+ # ifndef OPENSSL_NO_BIO\r
+ void ERR_print_errors(BIO *bp);\r
+ # endif\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
+ void ERR_add_error_vdata(int num, va_list args);\r
+ void ERR_load_strings(int lib, ERR_STRING_DATA str[]);\r
+ void ERR_unload_strings(int lib, ERR_STRING_DATA str[]);\r