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/Include/openssl | |
| 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/Include/openssl')
| -rw-r--r-- | Cryptlib/Include/openssl/bio.h | 9 | ||||
| -rw-r--r-- | Cryptlib/Include/openssl/err.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Cryptlib/Include/openssl/bio.h b/Cryptlib/Include/openssl/bio.h index 8f2438cd..2efa873d 100644 --- a/Cryptlib/Include/openssl/bio.h +++ b/Cryptlib/Include/openssl/bio.h @@ -59,6 +59,7 @@ #ifndef HEADER_BIO_H # define HEADER_BIO_H +# include <OpenSslSupport.h> # include <openssl/e_os2.h> # ifndef OPENSSL_NO_FP_API @@ -791,13 +792,13 @@ void BIO_copy_next_retry(BIO *b); # else # define __bio_h__attr__(x) # endif -int BIO_printf(BIO *bio, const char *format, ...) +int EFIAPI BIO_printf(BIO *bio, const char *format, ...) __bio_h__attr__((__format__(__printf__, 2, 3))); -int BIO_vprintf(BIO *bio, const char *format, va_list args) +int EFIAPI BIO_vprintf(BIO *bio, const char *format, va_list args) __bio_h__attr__((__format__(__printf__, 2, 0))); -int BIO_snprintf(char *buf, size_t n, const char *format, ...) +int EFIAPI BIO_snprintf(char *buf, size_t n, const char *format, ...) __bio_h__attr__((__format__(__printf__, 3, 4))); -int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) +int EFIAPI BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) __bio_h__attr__((__format__(__printf__, 3, 0))); # undef __bio_h__attr__ diff --git a/Cryptlib/Include/openssl/err.h b/Cryptlib/Include/openssl/err.h index 04c6cfc6..32da8c37 100644 --- a/Cryptlib/Include/openssl/err.h +++ b/Cryptlib/Include/openssl/err.h @@ -344,8 +344,8 @@ void ERR_print_errors_fp(FILE *fp); # ifndef OPENSSL_NO_BIO void ERR_print_errors(BIO *bp); # endif -void ERR_add_error_data(int num, ...); -void ERR_add_error_vdata(int num, va_list args); +void EFIAPI ERR_add_error_data(int num, ...); +void EFIAPI ERR_add_error_vdata(int num, va_list args); 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); |