Remove redundant declarations of ERR_load_*_strings()

In commit 52df25cf2e656146cb3b206d8220124f0417d03f, the
ERR_load_FOO_strings() functions were moved from their original
location in foo.h into new headers called fooerr.h.  But they were
never removed from their original locations.  This duplication
causes redundant-declaration warnings on programs that use OpenSSL's
headers with such warnings enabled.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5150)

diff --git a/include/openssl/async.h b/include/openssl/async.h
index 45ff30a96fab5e934092ce981e8c0d1b8e54b83c..4db02c39c56a802009a055ea700ca5370eaee345 100644 (file)
--- a/include/openssl/async.h
+++ b/include/openssl/async.h
@@ -69,7 +69,6 @@ ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job);
 void ASYNC_block_pause(void);
 void ASYNC_unblock_pause(void);
 
-int ERR_load_ASYNC_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index d8d8ac403184cc436f073e49c934cf6bb97633e1..4a32a0de8b665e8569e8427b44d69b1311147236 100644 (file)
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -790,7 +790,6 @@ long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom))
 int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
                                long (*callback_ctrl) (BIO *, int,
                                                       BIO_info_cb *));
-int ERR_load_BIO_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index 93c8fe962e7a0f75d460251ea3d85b4a4c71eb9e..ebca6f91de4eb5e780a07353509feabaf1585fd2 100644 (file)
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -481,7 +481,6 @@ BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn);
 
 int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
 
-int ERR_load_BN_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h
index 6f243bac649cede57c137060f77a8d7de40093ad..8868e854724e02cc85dc132e796f8d6aeb3a8cee 100644 (file)
--- a/include/openssl/buffer.h
+++ b/include/openssl/buffer.h
@@ -51,7 +51,6 @@ size_t BUF_MEM_grow(BUF_MEM *str, size_t len);
 size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
 void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
 
-int ERR_load_BUF_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/cms.h b/include/openssl/cms.h
index c9294e5b4f7c53da970372ef71cfce093c18695a..791012759e5cc1b272567cd7acba750927d8e378 100644 (file)
--- a/include/openssl/cms.h
+++ b/include/openssl/cms.h
@@ -335,7 +335,6 @@ int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
 # define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE \
     CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE
 
-int ERR_load_CMS_strings(void);
 #  ifdef  __cplusplus
 }
 #  endif

diff --git a/include/openssl/comp.h b/include/openssl/comp.h
index 27ff6597c7e52b2b4801c18679b841d4ae113023..6b20aac4c48cc9ed5799f65c3da334104a797318 100644 (file)
--- a/include/openssl/comp.h
+++ b/include/openssl/comp.h
@@ -45,7 +45,6 @@ const BIO_METHOD *BIO_f_zlib(void);
 #  endif
 # endif
 
-int ERR_load_COMP_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 702dceb0a2563bbd1650ce2305acd107dffc66bc..bca8a0542064413fbe7d617a8c09daede677528d 100644 (file)
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -161,7 +161,6 @@ int CONF_parse_list(const char *list, int sep, int nospc,
 
 void OPENSSL_load_builtin_modules(void);
 
-int ERR_load_CONF_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 478f9e2843488b5b7628a9f2815ac3bfc8e70ba8..4daf0c738cf1803fc0b9be33af9a95c99a2c53a3 100644 (file)
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -439,7 +439,6 @@ int CRYPTO_THREAD_cleanup_local(CRYPTO_THREAD_LOCAL *key);
 CRYPTO_THREAD_ID CRYPTO_THREAD_get_current_id(void);
 int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b);
 
-int ERR_load_CRYPTO_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index 96f3b7cfe628e04973bfe181e0ada08fea4611b3..68c5d4132743269b3d6acb06e4096ba6b4264a79 100644 (file)
--- a/include/openssl/ct.h
+++ b/include/openssl/ct.h
@@ -469,7 +469,6 @@ __owur int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file);
  */
 __owur int CTLOG_STORE_load_default_file(CTLOG_STORE *store);
 
-int ERR_load_CT_strings(void);
 #  ifdef  __cplusplus
 }
 #  endif

diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 00858244b81d9246fe00ff33876a692f5b7afc74..2a12b9df72d305022552638f285357d6cc9f4d0e 100644 (file)
--- a/include/openssl/dh.h
+++ b/include/openssl/dh.h
@@ -327,7 +327,6 @@ int DH_meth_set_generate_params(DH_METHOD *dhm,
 # define EVP_PKEY_DH_KDF_X9_42                           2
 # endif
 
-int ERR_load_DH_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index d8e680c6bf03ef1ada75bcec0cfc88846a35ee18..39f0f57463bc0831d0b05a8c2e6c27cd6ff309b2 100644 (file)
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -224,7 +224,6 @@ int DSA_meth_set_paramgen(DSA_METHOD *dsam,
 int (*DSA_meth_get_keygen(const DSA_METHOD *dsam)) (DSA *);
 int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen) (DSA *));
 
-int ERR_load_DSA_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 65800dd4b3e1ff2b35deb10a1a334169f349f76e..a8627cf6f96cc313efade8979b974c86a6f2f1dc 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -1346,7 +1346,6 @@ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
 # define EVP_PKEY_ECDH_KDF_NONE                          1
 # define EVP_PKEY_ECDH_KDF_X9_62                         2
 
-int ERR_load_EC_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 9f5975722bf257f7fd25c649433f601005a5c1b0..89722b021207cd5fa08e21294aa9e84321556fb7 100644 (file)
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -743,7 +743,6 @@ void *ENGINE_get_static_state(void);
 DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void))
 # endif
 
-int ERR_load_ENGINE_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 4a3fee12eb74fc9bbcaafacd5262cda64e217255..268e90f3d5050a1b31bb953f4ec086936dad4024 100644 (file)
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1587,7 +1587,6 @@ void EVP_PKEY_meth_get_param_check(EVP_PKEY_METHOD *pmeth,
 
 void EVP_add_alg_module(void);
 
-int ERR_load_EVP_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h
index 26380ca479f3907960a22b6e6c62649f2f8686b2..c1733a5beb20d9dc7c4b942fbc67e2b2ce0ae607 100644 (file)
--- a/include/openssl/kdf.h
+++ b/include/openssl/kdf.h
@@ -90,7 +90,6 @@ extern "C" {
             EVP_PKEY_CTX_ctrl_uint64(pctx, -1, EVP_PKEY_OP_DERIVE, \
                             EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, maxmem_bytes)
 
-int ERR_load_KDF_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/objects.h b/include/openssl/objects.h
index 54b42ee674abb45600946dd8e946d3c2a7cb47d6..484562d86392544807550d4a1e4cd243086fd570 100644 (file)
--- a/include/openssl/objects.h
+++ b/include/openssl/objects.h
@@ -168,7 +168,6 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
 int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
 void OBJ_sigid_free(void);
 
-int ERR_load_OBJ_strings(void);
 
 # ifdef  __cplusplus
 }

diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h
index 0b89a64eec9ee4f47cdbe70373b2a1d9168fab18..a5c44768aaf340db25fcbbe0fbfcc208b43f8b84 100644 (file)
--- a/include/openssl/ocsp.h
+++ b/include/openssl/ocsp.h
@@ -345,7 +345,6 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags);
 int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
                       X509_STORE *st, unsigned long flags);
 
-int ERR_load_OCSP_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index 10b19a59855a5b045af23394db84b6e1f1e47d8e..3b21ab8234bfc55c52b5c306d83e8c30e414c8bd 100644 (file)
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -372,7 +372,6 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
 #  endif
 # endif
 
-int ERR_load_PEM_strings(void);
 # ifdef  __cplusplus
 }
 # endif

diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h
index cfe73f139ed3c291ecb9a6c68297035b1dd144ab..8a46324af35bfd4c32e9a52a3b5fa78523e0420d 100644 (file)
--- a/include/openssl/pem2.h
+++ b/include/openssl/pem2.h
@@ -11,10 +11,6 @@
 extern "C" {
 #endif
 
-#ifndef HEADER_PEM_H
-int ERR_load_PEM_strings(void);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index 2dec35ea53c08b171c32e708cb461fa7fc3d20be..cfccd716d57ed5933a675f05c98ab50212daddb8 100644 (file)
--- a/include/openssl/rand.h
+++ b/include/openssl/rand.h
@@ -71,7 +71,6 @@ DEPRECATEDIN_1_1_0(void RAND_screen(void))
 DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM))
 # endif
 
-int ERR_load_RAND_strings(void);
 
 #ifdef  __cplusplus
 }

diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index 8985219aee753e6ee64d5fcda4384b65e1ef9a06..38d9f0106972238bb5e5bb81de5ec74e1721b7c4 100644 (file)
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -496,7 +496,6 @@ int RSA_meth_set_multi_prime_keygen(RSA_METHOD *meth,
                                     int (*keygen) (RSA *rsa, int bits,
                                                    int primes, BIGNUM *e,
                                                    BN_GENCB *cb));
-int ERR_load_RSA_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 9c45b900757f38e25129a151c6a0c7f26c9904b0..825490b5c24e0c1339b271843c32e63518651e26 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2292,7 +2292,6 @@ __owur int SSL_alloc_buffers(SSL *ssl);
 
 extern const char SSL_version_str[];
 
-int ERR_load_SSL_strings(void);
 
 
 typedef unsigned int (*DTLS_timer_cb)(SSL *s, unsigned int timer_us);

diff --git a/include/openssl/store.h b/include/openssl/store.h
index 43cf2031e79aaddd1ef9b48a95ac07eeb3aa3ff8..dff9d1e52113e96f34aaf024553afeb88b23f5b6 100644 (file)
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -203,12 +203,6 @@ int OSSL_STORE_do_all_loaders(void (*do_function) (const OSSL_STORE_LOADER
                                                    *loader, void *do_arg),
                               void *do_arg);
 
-
-/*
- * Error strings
- */
-int ERR_load_OSSL_STORE_strings(void);
-
 # ifdef  __cplusplus
 }
 # endif

diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 5d56c96a3b5d4b8e94006e12b737d9268c0277ed..3317e8f7616fcad4253f212e8af643b4d24b40f8 100644 (file)
--- a/include/openssl/ts.h
+++ b/include/openssl/ts.h
@@ -551,7 +551,6 @@ int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
                                   TS_RESP_CTX *ctx);
 int TS_CONF_set_ess_cert_id_digest(CONF *conf, const char *section,
                                       TS_RESP_CTX *ctx);
-int ERR_load_TS_strings(void);
 
 #  ifdef  __cplusplus
 }

diff --git a/include/openssl/ui.h b/include/openssl/ui.h
index 1da1ccb48043fbe175ebe54cb9e5fa4a20ffb5f6..ab1d7e30d8800be57c3fbcd742ab628cb98248bd 100644 (file)
--- a/include/openssl/ui.h
+++ b/include/openssl/ui.h
@@ -361,7 +361,6 @@ int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
                     int verify);
 UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag);
 
-int ERR_load_UI_strings(void);
 
 # ifdef  __cplusplus
 }