diff options
| author | Steve McIntyre <steve@einval.com> | 2021-03-23 23:49:46 +0000 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2021-03-23 23:49:46 +0000 |
| commit | 1251a7ba86fc40a6aad8b4fecdbca2b61808d9fa (patch) | |
| tree | 2125fda549aaca55cb49a48d54be77dec7fbf3df /Cryptlib/Include/openssl | |
| parent | 85b409232ce89b34626df9d72abedf5d4f5ccef6 (diff) | |
| parent | 031e5cce385d3f96b1caa1d53495332a7eb03749 (diff) | |
| download | efi-boot-shim-debian/15.3-1.tar.gz efi-boot-shim-debian/15.3-1.zip | |
Update upstream source from tag 'upstream/15.3'debian/15.3-1
Update to upstream version '15.3'
with Debian dir 1b484f1c1ac270604a5a1451b34de4b0865c6211
Diffstat (limited to 'Cryptlib/Include/openssl')
| -rw-r--r-- | Cryptlib/Include/openssl/bio.h | 9 | ||||
| -rw-r--r-- | Cryptlib/Include/openssl/crypto.h | 1 | ||||
| -rw-r--r-- | Cryptlib/Include/openssl/err.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Cryptlib/Include/openssl/bio.h b/Cryptlib/Include/openssl/bio.h index 8f2438cd..da8c6580 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, ms_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, ms_va_list args) __bio_h__attr__((__format__(__printf__, 3, 0))); # undef __bio_h__attr__ diff --git a/Cryptlib/Include/openssl/crypto.h b/Cryptlib/Include/openssl/crypto.h index bea4ca19..e201a123 100644 --- a/Cryptlib/Include/openssl/crypto.h +++ b/Cryptlib/Include/openssl/crypto.h @@ -117,6 +117,7 @@ #ifndef HEADER_CRYPTO_H # define HEADER_CRYPTO_H +# include <string.h> # include <stdlib.h> # include <openssl/e_os2.h> diff --git a/Cryptlib/Include/openssl/err.h b/Cryptlib/Include/openssl/err.h index 04c6cfc6..5a019808 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, ms_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); |