diff options
Diffstat (limited to 'include')
31 files changed, 32 insertions, 34 deletions
diff --git a/include/internal/dso.h b/include/internal/dso.h index d371fbe465..970beeb195 100644 --- a/include/internal/dso.h +++ b/include/internal/dso.h @@ -153,7 +153,7 @@ void *DSO_global_lookup(const char *name); * made after this point may be overwritten when the script is next run. */ -void ERR_load_DSO_strings(void); +int ERR_load_DSO_strings(void); /* Error codes for the DSO functions. */ diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 6994abf0cc..e313109d22 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -875,7 +875,7 @@ int SMIME_text(BIO *in, BIO *out); * made after this point may be overwritten when the script is next run. */ -void ERR_load_ASN1_strings(void); +int ERR_load_ASN1_strings(void); /* Error codes for the ASN1 functions. */ diff --git a/include/openssl/async.h b/include/openssl/async.h index ca51bb3412..5b2e496dbd 100644 --- a/include/openssl/async.h +++ b/include/openssl/async.h @@ -74,7 +74,7 @@ void ASYNC_unblock_pause(void); * made after this point may be overwritten when the script is next run. */ -void ERR_load_ASYNC_strings(void); +int ERR_load_ASYNC_strings(void); /* Error codes for the ASYNC functions. */ diff --git a/include/openssl/bio.h b/include/openssl/bio.h index d486d07199..ed50139ed4 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -763,7 +763,7 @@ int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, * made after this point may be overwritten when the script is next run. */ -void ERR_load_BIO_strings(void); +int ERR_load_BIO_strings(void); /* Error codes for the BIO functions. */ diff --git a/include/openssl/bn.h b/include/openssl/bn.h index c4fca99ff6..1e3c24af46 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h @@ -488,7 +488,7 @@ int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom); * made after this point may be overwritten when the script is next run. */ -void ERR_load_BN_strings(void); +int ERR_load_BN_strings(void); /* Error codes for the BN functions. */ diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h index e2e1e5da9d..91f0e07ff9 100644 --- a/include/openssl/buffer.h +++ b/include/openssl/buffer.h @@ -59,7 +59,7 @@ void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz); * made after this point may be overwritten when the script is next run. */ -void ERR_load_BUF_strings(void); +int ERR_load_BUF_strings(void); /* Error codes for the BUF functions. */ diff --git a/include/openssl/cms.h b/include/openssl/cms.h index b1252acd6e..dbc27e5562 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -335,7 +335,7 @@ int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg, * made after this point may be overwritten when the script is next run. */ -void ERR_load_CMS_strings(void); +int ERR_load_CMS_strings(void); /* Error codes for the CMS functions. */ diff --git a/include/openssl/comp.h b/include/openssl/comp.h index 520d709a6f..260ff1e0ac 100644 --- a/include/openssl/comp.h +++ b/include/openssl/comp.h @@ -50,7 +50,7 @@ const BIO_METHOD *BIO_f_zlib(void); * made after this point may be overwritten when the script is next run. */ -void ERR_load_COMP_strings(void); +int ERR_load_COMP_strings(void); /* Error codes for the COMP functions. */ diff --git a/include/openssl/conf.h b/include/openssl/conf.h index 147d27bb2a..462e3c9d39 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -168,7 +168,7 @@ void OPENSSL_load_builtin_modules(void); * made after this point may be overwritten when the script is next run. */ -void ERR_load_CONF_strings(void); +int ERR_load_CONF_strings(void); /* Error codes for the CONF functions. */ diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index cbd05a8acc..18b9c1b7ba 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -436,7 +436,7 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b); * made after this point may be overwritten when the script is next run. */ -void ERR_load_CRYPTO_strings(void); +int ERR_load_CRYPTO_strings(void); /* Error codes for the CRYPTO functions. */ diff --git a/include/openssl/ct.h b/include/openssl/ct.h index be7a953ff4..3b011cc932 100644 --- a/include/openssl/ct.h +++ b/include/openssl/ct.h @@ -481,7 +481,7 @@ __owur int CTLOG_STORE_load_default_file(CTLOG_STORE *store); * made after this point may be overwritten when the script is next run. */ -void ERR_load_CT_strings(void); +int ERR_load_CT_strings(void); /* Error codes for the CT functions. */ diff --git a/include/openssl/dh.h b/include/openssl/dh.h index a574e1871e..ae309e7b31 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -296,7 +296,7 @@ int DH_meth_set_generate_params(DH_METHOD *dhm, * made after this point may be overwritten when the script is next run. */ -void ERR_load_DH_strings(void); +int ERR_load_DH_strings(void); /* Error codes for the DH functions. */ diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index 11ddd397b3..cbc60e168a 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -233,7 +233,7 @@ int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen) (DSA *)); * made after this point may be overwritten when the script is next run. */ -void ERR_load_DSA_strings(void); +int ERR_load_DSA_strings(void); /* Error codes for the DSA functions. */ diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 03942eda84..ebeb3e9a4b 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -1360,7 +1360,7 @@ void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth, * made after this point may be overwritten when the script is next run. */ -void ERR_load_EC_strings(void); +int ERR_load_EC_strings(void); /* Error codes for the EC functions. */ diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 21c6961286..c0bedf6f97 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -755,7 +755,7 @@ DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void)) * made after this point may be overwritten when the script is next run. */ -void ERR_load_ENGINE_strings(void); +int ERR_load_ENGINE_strings(void); /* Error codes for the ENGINE functions. */ diff --git a/include/openssl/err.h b/include/openssl/err.h index 60ffc49edc..d98c9cd340 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -231,9 +231,9 @@ void ERR_print_errors_fp(FILE *fp); void ERR_print_errors(BIO *bp); void ERR_add_error_data(int num, ...); void ERR_add_error_vdata(int num, va_list args); -void ERR_load_strings(int lib, ERR_STRING_DATA str[]); +int ERR_load_strings(int lib, ERR_STRING_DATA str[]); int ERR_unload_strings(int lib, ERR_STRING_DATA str[]); -void ERR_load_ERR_strings(void); +int ERR_load_ERR_strings(void); #if OPENSSL_API_COMPAT < 0x10100000L # define ERR_load_crypto_strings() \ diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 997f1e2c21..999660365c 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1440,7 +1440,7 @@ void EVP_add_alg_module(void); * made after this point may be overwritten when the script is next run. */ -void ERR_load_EVP_strings(void); +int ERR_load_EVP_strings(void); /* Error codes for the EVP functions. */ diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index 3078b56dc4..9f87f788b2 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -56,7 +56,7 @@ extern "C" { * made after this point may be overwritten when the script is next run. */ -void ERR_load_KDF_strings(void); +int ERR_load_KDF_strings(void); /* Error codes for the KDF functions. */ diff --git a/include/openssl/objects.h b/include/openssl/objects.h index 4d3de7c9d0..09d614ffc0 100644 --- a/include/openssl/objects.h +++ b/include/openssl/objects.h @@ -1074,7 +1074,7 @@ void OBJ_sigid_free(void); * made after this point may be overwritten when the script is next run. */ -void ERR_load_OBJ_strings(void); +int ERR_load_OBJ_strings(void); /* Error codes for the OBJ functions. */ diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index c74495a0b2..a468a5233e 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -352,7 +352,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs, * made after this point may be overwritten when the script is next run. */ -void ERR_load_OCSP_strings(void); +int ERR_load_OCSP_strings(void); /* Error codes for the OCSP functions. */ diff --git a/include/openssl/pem.h b/include/openssl/pem.h index 6dd76eeace..2375d63553 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -419,7 +419,7 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, * made after this point may be overwritten when the script is next run. */ -void ERR_load_PEM_strings(void); +int ERR_load_PEM_strings(void); /* Error codes for the PEM functions. */ diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h index 9cb74721e6..cfe73f139e 100644 --- a/include/openssl/pem2.h +++ b/include/openssl/pem2.h @@ -12,7 +12,7 @@ extern "C" { #endif #ifndef HEADER_PEM_H -void ERR_load_PEM_strings(void); +int ERR_load_PEM_strings(void); #endif #ifdef __cplusplus diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index 4c49fb2881..a1e9d1d581 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -212,7 +212,7 @@ int PKCS12_newpass(PKCS12 *p12, const char *oldpass, const char *newpass); * made after this point may be overwritten when the script is next run. */ -void ERR_load_PKCS12_strings(void); +int ERR_load_PKCS12_strings(void); /* Error codes for the PKCS12 functions. */ diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h index 328a4f66b4..691f722022 100644 --- a/include/openssl/pkcs7.h +++ b/include/openssl/pkcs7.h @@ -318,7 +318,7 @@ BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7); * made after this point may be overwritten when the script is next run. */ -void ERR_load_PKCS7_strings(void); +int ERR_load_PKCS7_strings(void); /* Error codes for the PKCS7 functions. */ diff --git a/include/openssl/rand.h b/include/openssl/rand.h index 8dab1a00fb..d521ae192a 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h @@ -73,7 +73,7 @@ DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM)) * made after this point may be overwritten when the script is next run. */ -void ERR_load_RAND_strings(void); +int ERR_load_RAND_strings(void); /* Error codes for the RAND functions. */ diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index b9d14e414c..9721218e1a 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -456,7 +456,7 @@ int RSA_meth_set_keygen(RSA_METHOD *rsa, * made after this point may be overwritten when the script is next run. */ -void ERR_load_RSA_strings(void); +int ERR_load_RSA_strings(void); /* Error codes for the RSA functions. */ diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 3a6cd4c5f9..1533daa4b7 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2036,7 +2036,7 @@ extern const char SSL_version_str[]; * made after this point may be overwritten when the script is next run. */ -void ERR_load_SSL_strings(void); +int ERR_load_SSL_strings(void); /* Error codes for the SSL functions. */ diff --git a/include/openssl/ts.h b/include/openssl/ts.h index 3e31b2fd3b..25ad13769a 100644 --- a/include/openssl/ts.h +++ b/include/openssl/ts.h @@ -156,8 +156,6 @@ ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a, const unsigned char **pp, long length); ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a); -void ERR_load_TS_strings(void); - int TS_REQ_set_version(TS_REQ *a, long version); long TS_REQ_get_version(const TS_REQ *a); @@ -532,7 +530,7 @@ int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section, * made after this point may be overwritten when the script is next run. */ -void ERR_load_TS_strings(void); +int ERR_load_TS_strings(void); /* Error codes for the TS functions. */ diff --git a/include/openssl/ui.h b/include/openssl/ui.h index dcebb6e771..26f4f04495 100644 --- a/include/openssl/ui.h +++ b/include/openssl/ui.h @@ -334,7 +334,7 @@ int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, * made after this point may be overwritten when the script is next run. */ -void ERR_load_UI_strings(void); +int ERR_load_UI_strings(void); /* Error codes for the UI functions. */ diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 2f7444dc46..581d830b00 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -995,7 +995,7 @@ int X509_TRUST_get_trust(const X509_TRUST *xp); * made after this point may be overwritten when the script is next run. */ -void ERR_load_X509_strings(void); +int ERR_load_X509_strings(void); /* Error codes for the X509 functions. */ diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index e6053c57fe..89be5f9c14 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -863,7 +863,7 @@ int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain, * made after this point may be overwritten when the script is next run. */ -void ERR_load_X509V3_strings(void); +int ERR_load_X509V3_strings(void); /* Error codes for the X509V3 functions. */ |