diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-09 12:16:23 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-10 15:54:20 -0500 |
| commit | 78809820b5a3f79a0bfbec00e630e40011acf4ec (patch) | |
| tree | faa20391b132a2749a978ab60bebb38b457c3807 /Cryptlib/OpenSSL/crypto/cryptlib.c | |
| parent | f033a1da9f4c3acf7e3dfef906d01e348b6fcf42 (diff) | |
| download | efi-boot-shim-78809820b5a3f79a0bfbec00e630e40011acf4ec.tar.gz efi-boot-shim-78809820b5a3f79a0bfbec00e630e40011acf4ec.zip | |
Fix Cryptlib's va_* definitions.
Some time ago, commit e571428e212 ("Update to openssl to 1.0.2e")
changed the way we define the va_* (and VA_*) functions and macros.
Unfortunately, it only changed for some parts of the tree, and the
different parts of the tree need to both call each other and use the
same types in all cases. Additionally, they need to all be able to call
gnu-efi functions such as VPrint, which means they need the same va_list
type definitions everywhere.
This partially reverts that patch, adding EFIAPI back and unsetting
NO_BUILTIN_VA_FUNCS everywhere.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/cryptlib.c')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/cryptlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Cryptlib/OpenSSL/crypto/cryptlib.c b/Cryptlib/OpenSSL/crypto/cryptlib.c index da4b34dc..23f58fa9 100644 --- a/Cryptlib/OpenSSL/crypto/cryptlib.c +++ b/Cryptlib/OpenSSL/crypto/cryptlib.c @@ -866,7 +866,7 @@ int OPENSSL_isservice(void) } # endif -void OPENSSL_showfatal(const char *fmta, ...) +void EFIAPI OPENSSL_showfatal(const char *fmta, ...) { va_list ap; TCHAR buf[256]; @@ -979,7 +979,7 @@ void OPENSSL_showfatal(const char *fmta, ...) MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR); } #else -void OPENSSL_showfatal(const char *fmta, ...) +void EFIAPI OPENSSL_showfatal(const char *fmta, ...) { #ifndef OPENSSL_NO_STDIO va_list ap; |