From 4d7072f4b5b536c080854eba4b0092d80adf4d37 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bodo=20M=C3=B6ller?= <bodo@openssl.org>
Date: Mon, 17 Dec 2001 19:22:23 +0000
Subject: [PATCH 1/1] remove redundant ERR_load_... declarations

---
 crypto/asn1/asn1.h       | 2 --
 crypto/bio/bio.h         | 2 --
 crypto/bn/bn.h           | 1 -
 crypto/buffer/buffer.h   | 2 --
 crypto/conf/conf.h       | 1 -
 crypto/dh/dh.h           | 1 -
 crypto/dsa/dsa.h         | 2 --
 crypto/dso/dso.h         | 1 -
 crypto/ec/ectest.c       | 2 +-
 crypto/evp/evp.h         | 2 --
 crypto/objects/objects.h | 2 --
 crypto/ocsp/ocsp.h       | 2 --
 crypto/pem/pem.h         | 2 --
 crypto/pkcs12/pkcs12.h   | 1 -
 crypto/pkcs7/pkcs7.h     | 2 --
 crypto/x509/x509.h       | 1 -
 crypto/x509v3/x509v3.h   | 2 --
 ssl/ssl.h                | 1 -
 18 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 18ecad3451..cdfca6cf12 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -886,8 +886,6 @@ void ASN1_HEADER_free(ASN1_HEADER *a);
 
 int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
 
-void ERR_load_ASN1_strings(void);
-
 /* Not used that much at this point, except for the first two */
 ASN1_METHOD *X509_asn1_meth(void);
 ASN1_METHOD *RSAPrivateKey_asn1_meth(void);
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 09a500d377..379cd58324 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -591,8 +591,6 @@ int BIO_sock_init(void );
 void BIO_sock_cleanup(void);
 int BIO_set_tcp_ndelay(int sock,int turn_on);
 
-void ERR_load_BIO_strings(void );
-
 BIO *BIO_new_socket(int sock, int close_flag);
 BIO *BIO_new_fd(int fd, int close_flag);
 BIO *BIO_new_connect(char *host_port);
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index ba8cbcba7e..d25b49c9d8 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -420,7 +420,6 @@ int	BN_is_prime(const BIGNUM *p,int nchecks,
 int	BN_is_prime_fasttest(const BIGNUM *p,int nchecks,
 	void (*callback)(int,int,void *),BN_CTX *ctx,void *cb_arg,
 	int do_trial_division);
-void	ERR_load_BN_strings(void );
 
 BN_MONT_CTX *BN_MONT_CTX_new(void );
 void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
diff --git a/crypto/buffer/buffer.h b/crypto/buffer/buffer.h
index afe7a46d43..11e2d0359a 100644
--- a/crypto/buffer/buffer.h
+++ b/crypto/buffer/buffer.h
@@ -75,8 +75,6 @@ void	BUF_MEM_free(BUF_MEM *a);
 int	BUF_MEM_grow(BUF_MEM *str, int len);
 char *	BUF_strdup(const char *str);
 
-void ERR_load_BUF_strings(void );
-
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 32246ff52c..3b767c1dcf 100644
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -110,7 +110,6 @@ long CONF_get_number(LHASH *conf,char *group,char *name);
 void CONF_free(LHASH *conf);
 int CONF_dump_fp(LHASH *conf, FILE *out);
 int CONF_dump_bio(LHASH *conf, BIO *out);
-void ERR_load_CONF_strings(void );
 
 /* New conf code.  The semantics are different from the functions above.
    If that wasn't the case, the above functions would have been replaced */
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 32ea17a4f5..1152fbb2d3 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -180,7 +180,6 @@ int	DHparams_print(BIO *bp, const DH *x);
 #else
 int	DHparams_print(char *bp, const DH *x);
 #endif
-void	ERR_load_DH_strings(void);
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index dcdd28f94d..377a76799b 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -183,8 +183,6 @@ int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
 int DSA_set_ex_data(DSA *d, int idx, void *arg);
 void *DSA_get_ex_data(DSA *d, int idx);
 
-void	ERR_load_DSA_strings(void );
-
 DSA *	d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
 DSA *	d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
 DSA * 	d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index a1678454a5..d87fb72a2f 100644
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -261,7 +261,6 @@ DSO_METHOD *DSO_METHOD_win32(void);
 /* If VMS is defined, use shared images. If not, return NULL. */
 DSO_METHOD *DSO_METHOD_vms(void);
 
-void ERR_load_DSO_strings(void);
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index b6ede1c3c6..d720050859 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -589,7 +589,7 @@ int main(int argc, char *argv[])
 	}
 
 
-#if 0
+#if 1
 	timings(P_192, 0, ctx);
 	timings(P_192, 1, ctx);
 	timings(P_224, 0, ctx);
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 255f957f48..8d86d85f8d 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -538,8 +538,6 @@ int	EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
 		char *out, int *outl);
 int	EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
 
-void	ERR_load_EVP_strings(void );
-
 void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
 int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
 int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 302238ca1d..de10532813 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -1011,8 +1011,6 @@ int		OBJ_cmp(const ASN1_OBJECT *a,const ASN1_OBJECT *b);
 const char *	OBJ_bsearch(const char *key,const char *base,int num,int size,
 	int (*cmp)(const void *, const void *));
 
-void		ERR_load_OBJ_strings(void );
-
 int		OBJ_new_nid(int num);
 int		OBJ_add_object(const ASN1_OBJECT *obj);
 int		OBJ_create(const char *oid,const char *sn,const char *ln);
diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h
index 357bfd99b2..fab3c03182 100644
--- a/crypto/ocsp/ocsp.h
+++ b/crypto/ocsp/ocsp.h
@@ -554,8 +554,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);
 
-void ERR_load_OCSP_strings(void);
-
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 188331f248..3785fca77d 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -528,8 +528,6 @@ void    PEM_SignUpdate(EVP_MD_CTX *ctx,unsigned char *d,unsigned int cnt);
 int	PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
 		unsigned int *siglen, EVP_PKEY *pkey);
 
-void	ERR_load_PEM_strings(void);
-
 int	PEM_def_callback(char *buf, int num, int w, void *key);
 void	PEM_proc_type(char *buf, int type);
 void	PEM_dek_info(char *buf, const char *type, int len, char *str);
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 52fd37714c..1786b6d4f3 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -243,7 +243,6 @@ DECLARE_ASN1_FUNCTIONS(PKCS12_BAGS)
 DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS)
 DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
 
-void ERR_load_PKCS12_strings(void);
 void PKCS12_PBE_add(void);
 int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
 		 STACK_OF(X509) **ca);
diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index cfade5ea56..5819700a85 100644
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -300,8 +300,6 @@ DECLARE_ASN1_FUNCTIONS(PKCS7)
 DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
 DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
 
-void ERR_load_PKCS7_strings(void);
-
 
 long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
 
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 9a4b0db435..c75aa0c717 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -829,7 +829,6 @@ const char *	X509_get_default_private_dir(void );
 
 X509_REQ *	X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
 X509 *		X509_REQ_to_X509(X509_REQ *r, int days,EVP_PKEY *pkey);
-void ERR_load_X509_strings(void );
 
 DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
 DECLARE_ASN1_FUNCTIONS(X509_VAL)
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index d1c9828f78..daecc55271 100644
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -404,8 +404,6 @@ typedef struct x509_purpose_st {
 
 DECLARE_STACK_OF(X509_PURPOSE)
 
-void ERR_load_X509V3_strings(void);
-
 DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
 
 DECLARE_ASN1_FUNCTIONS(SXNET)
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 611a260c7b..7676946ec6 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1134,7 +1134,6 @@ int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 
 #endif
 
-void	ERR_load_SSL_strings(void );
 void	SSL_load_error_strings(void );
 const char *SSL_state_string(SSL *s);
 const char *SSL_rstate_string(SSL *s);
-- 
2.34.1