CryptoPkg: OpensslLib: reintroduce EFIAPI for ERR_add_error_data()

Git commit f93f78ea70 (SVN r17633), with subject "CryptoPkg: Update
openssl patch file from 0.9.8zf to 1.0.2c", replaced the file

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

with

  CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2c.patch

In the process, two hunks were lost that used to add EFIAPI to the
declaration of the variadic function ERR_add_error_data().

The VA_START() macro, from "MdePkg/Include/Base.h", expands to an
EFIAPI-dependent implementation when

  !defined(__CC_ARM) && (!defined(__GNUC__) ||
                         defined(NO_BUILTIN_VA_FUNCS))

Under such circumstances, the va_start() macro invocation in
ERR_add_error_data() -- which is translated to VA_START() by
"CryptoPkg/Include/OpenSslSupport.h" -- results in EFIAPI-dependent code,
but callers of the function pass the arguments incorrectly, because the
declaration doesn't state EFIAPI.

This leads to crashes when ERR_add_error_vdata(), called by
ERR_add_error_data(), tries to access the arguments forwarded to it.

Restore the missing hunk from before SVN r17633.

Cc: Qin Long <qin.long@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gary Ching-Pang Lin <glin@suse.com>
Cc: Peter Jones <pjones@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Peter Jones <pjones@redhat.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Qin Long <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17689 6f19259b-4bc3-4df7-8a09-765794883524

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