diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2015-07-15 16:33:32 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2015-07-28 11:46:38 -0400 |
| commit | a7f4b26cc35204165bd04e75c34e8e7aa2a87ecc (patch) | |
| tree | 509c0fa5845407046ca07af6f98926bb4b6a804e /Cryptlib | |
| parent | 4ac84f8673eb7f3e5b98226aabe21f3e3111c7db (diff) | |
| download | efi-boot-shim-a7f4b26cc35204165bd04e75c34e8e7aa2a87ecc.tar.gz efi-boot-shim-a7f4b26cc35204165bd04e75c34e8e7aa2a87ecc.zip | |
Openssl: Add EFIAPI for ERR_add_error_vdata
Without declaring EFIAPI for ERR_add_error_vdata, shim would crash
while verifying the loaded image.
Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
Diffstat (limited to 'Cryptlib')
| -rw-r--r-- | Cryptlib/Include/openssl/err.h | 4 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/err/err.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Cryptlib/Include/openssl/err.h b/Cryptlib/Include/openssl/err.h index bbfdb959..da589f8d 100644 --- a/Cryptlib/Include/openssl/err.h +++ b/Cryptlib/Include/openssl/err.h @@ -352,7 +352,11 @@ void EFIAPI ERR_add_error_data(int num, ...); void ERR_add_error_data(int num, ...); #endif +#if defined(OPENSSL_SYS_UEFI) +void EFIAPI ERR_add_error_vdata(int num, va_list args); +#else void ERR_add_error_vdata(int num, va_list args); +#endif void ERR_load_strings(int lib, ERR_STRING_DATA str[]); void ERR_unload_strings(int lib, ERR_STRING_DATA str[]); void ERR_load_ERR_strings(void); diff --git a/Cryptlib/OpenSSL/crypto/err/err.c b/Cryptlib/OpenSSL/crypto/err/err.c index f98cce6a..108b83a9 100644 --- a/Cryptlib/OpenSSL/crypto/err/err.c +++ b/Cryptlib/OpenSSL/crypto/err/err.c @@ -1085,7 +1085,11 @@ void ERR_add_error_data(int num, ...) va_end(args); } +#if defined(OPENSSL_SYS_UEFI) +void EFIAPI ERR_add_error_vdata(int num, va_list args) +#else void ERR_add_error_vdata(int num, va_list args) +#endif { int i, n, s; char *str, *p, *a; |