openssl_setup() calls SSL_load_error_strings(), which happens to call

ERR_load_crypto_strings() - as such, we do not need to call the same
function from most of the applications.

27 files changed, 30 insertions, 60 deletions

diff --git a/usr.bin/openssl/asn1pars.c b/usr.bin/openssl/asn1pars.c
index 6ba43afb974..e6d5339f661 100644
--- a/usr.bin/openssl/asn1pars.c
+++ b/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1pars.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -193,7 +193,6 @@ bad:
 		BIO_printf(bio_err, " -genconf file file to generate ASN1 structure from\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 	in = BIO_new(BIO_s_file());
 	out = BIO_new(BIO_s_file());
diff --git a/usr.bin/openssl/ca.c b/usr.bin/openssl/ca.c
index c19ecc6616d..e895eab9e09 100644
--- a/usr.bin/openssl/ca.c
+++ b/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: ca.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -513,7 +513,6 @@ bad:
 			BIO_printf(bio_err, "%s", *pp2);
 		goto err;
 	}
-	ERR_load_crypto_strings();
 
 	/*****************************************************************/
 	tofree = NULL;
diff --git a/usr.bin/openssl/crl.c b/usr.bin/openssl/crl.c
index ef0198c7331..ba2e479b860 100644
--- a/usr.bin/openssl/crl.c
+++ b/usr.bin/openssl/crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl.c,v 1.2 2014/08/28 14:01:32 jsing Exp $ */
+/* $OpenBSD: crl.c,v 1.3 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -272,7 +272,6 @@ crl_main(int argc, char **argv)
 		}
 	}
 
-	ERR_load_crypto_strings();
 	x = load_crl(crl_config.infile, crl_config.informat);
 	if (x == NULL)
 		goto end;
diff --git a/usr.bin/openssl/crl2p7.c b/usr.bin/openssl/crl2p7.c
index 7fdb6ccfd47..b2c114aac85 100644
--- a/usr.bin/openssl/crl2p7.c
+++ b/usr.bin/openssl/crl2p7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl2p7.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: crl2p7.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -155,7 +155,6 @@ bad:
 		ret = 1;
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 	in = BIO_new(BIO_s_file());
 	out = BIO_new(BIO_s_file());
diff --git a/usr.bin/openssl/dh.c b/usr.bin/openssl/dh.c
index 447b4c800fd..ce109980903 100644
--- a/usr.bin/openssl/dh.c
+++ b/usr.bin/openssl/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: dh.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -168,7 +168,6 @@ bad:
 #endif
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
 	setup_engine(bio_err, engine, 0);
diff --git a/usr.bin/openssl/dhparam.c b/usr.bin/openssl/dhparam.c
index 0022f726701..468fa004198 100644
--- a/usr.bin/openssl/dhparam.c
+++ b/usr.bin/openssl/dhparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: dhparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -234,7 +234,6 @@ bad:
 		BIO_printf(bio_err, " -noout        no output\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
 	setup_engine(bio_err, engine, 0);
diff --git a/usr.bin/openssl/dsa.c b/usr.bin/openssl/dsa.c
index b8ca7dd2ef2..a84b25503bc 100644
--- a/usr.bin/openssl/dsa.c
+++ b/usr.bin/openssl/dsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: dsa.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -215,7 +215,6 @@ bad:
 		BIO_printf(bio_err, " -modulus        print the DSA public value\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
 	e = setup_engine(bio_err, engine, 0);
diff --git a/usr.bin/openssl/dsaparam.c b/usr.bin/openssl/dsaparam.c
index 5c17a2c9ac2..ccb533421ad 100644
--- a/usr.bin/openssl/dsaparam.c
+++ b/usr.bin/openssl/dsaparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsaparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: dsaparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -209,7 +209,6 @@ bad:
 		BIO_printf(bio_err, " number        number of bits to use for generating private key\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 	in = BIO_new(BIO_s_file());
 	out = BIO_new(BIO_s_file());
diff --git a/usr.bin/openssl/ec.c b/usr.bin/openssl/ec.c
index f1bdf55e334..063e57c8181 100644
--- a/usr.bin/openssl/ec.c
+++ b/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: ec.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -226,7 +226,6 @@ bad:
 		    "explicit\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
 	setup_engine(bio_err, engine, 0);
diff --git a/usr.bin/openssl/ecparam.c b/usr.bin/openssl/ecparam.c
index 9623cb96ce1..782069a8e53 100644
--- a/usr.bin/openssl/ecparam.c
+++ b/usr.bin/openssl/ecparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: ecparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -262,7 +262,6 @@ bad:
 		    "possibly a hardware device\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 	in = BIO_new(BIO_s_file());
 	out = BIO_new(BIO_s_file());
diff --git a/usr.bin/openssl/genpkey.c b/usr.bin/openssl/genpkey.c
index 02332f66825..09b130e83a6 100644
--- a/usr.bin/openssl/genpkey.c
+++ b/usr.bin/openssl/genpkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genpkey.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: genpkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -97,7 +97,6 @@ genpkey_main(int argc, char **argv)
 
 	outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
diff --git a/usr.bin/openssl/genrsa.c b/usr.bin/openssl/genrsa.c
index 7844fb815fb..b7534a0a5e6 100644
--- a/usr.bin/openssl/genrsa.c
+++ b/usr.bin/openssl/genrsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genrsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: genrsa.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -198,7 +198,6 @@ bad:
 #endif
 		goto err;
 	}
-	ERR_load_crypto_strings();
 
 	if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 		BIO_printf(bio_err, "Error getting password\n");
diff --git a/usr.bin/openssl/nseq.c b/usr.bin/openssl/nseq.c
index 6c32f7c4b4c..6bc58185c02 100644
--- a/usr.bin/openssl/nseq.c
+++ b/usr.bin/openssl/nseq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nseq.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */
+/* $OpenBSD: nseq.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -77,8 +77,6 @@ nseq_main(int argc, char **argv)
 	int i, ret = 1;
 	int badarg = 0;
 
-	ERR_load_crypto_strings();
-
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
 		if (!strcmp(*args, "-toseq"))
diff --git a/usr.bin/openssl/pkcs12.c b/usr.bin/openssl/pkcs12.c
index 77b7c31d016..41924a9698d 100644
--- a/usr.bin/openssl/pkcs12.c
+++ b/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs12.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: pkcs12.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -386,9 +386,6 @@ pkcs12_main(int argc, char **argv)
 		mpass = macpass;
 	}
 
-	ERR_load_crypto_strings();
-
-
 	if (!infile)
 		in = BIO_new_fp(stdin, BIO_NOCLOSE);
 	else
diff --git a/usr.bin/openssl/pkcs7.c b/usr.bin/openssl/pkcs7.c
index 2c2af168a95..70b58d8b844 100644
--- a/usr.bin/openssl/pkcs7.c
+++ b/usr.bin/openssl/pkcs7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: pkcs7.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -159,7 +159,6 @@ bad:
 		ret = 1;
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
 	setup_engine(bio_err, engine, 0);
diff --git a/usr.bin/openssl/pkcs8.c b/usr.bin/openssl/pkcs8.c
index 1715fe1d6b6..c2aefdc1525 100644
--- a/usr.bin/openssl/pkcs8.c
+++ b/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -95,7 +95,6 @@ pkcs8_main(int argc, char **argv)
 	informat = FORMAT_PEM;
 	outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
diff --git a/usr.bin/openssl/pkey.c b/usr.bin/openssl/pkey.c
index 7f13bbbf620..4fbc7223298 100644
--- a/usr.bin/openssl/pkey.c
+++ b/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkey.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: pkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -88,7 +88,6 @@ pkey_main(int argc, char **argv)
 	informat = FORMAT_PEM;
 	outformat = FORMAT_PEM;
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
diff --git a/usr.bin/openssl/pkeyparam.c b/usr.bin/openssl/pkeyparam.c
index c48f1a95ddf..1e60430b26d 100644
--- a/usr.bin/openssl/pkeyparam.c
+++ b/usr.bin/openssl/pkeyparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyparam.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: pkeyparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -80,7 +80,6 @@ pkeyparam_main(int argc, char **argv)
 #endif
 	int ret = 1;
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	args = argv + 1;
 	while (!badarg && *args && *args[0] == '-') {
diff --git a/usr.bin/openssl/pkeyutl.c b/usr.bin/openssl/pkeyutl.c
index 5fff008db62..f233d76ddac 100644
--- a/usr.bin/openssl/pkeyutl.c
+++ b/usr.bin/openssl/pkeyutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyutl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: pkeyutl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -106,7 +106,6 @@ pkeyutl_main(int argc, char **argv)
 	argc--;
 	argv++;
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 
 	while (argc >= 1) {
diff --git a/usr.bin/openssl/req.c b/usr.bin/openssl/req.c
index 87599b35e14..98f3e1d84cd 100644
--- a/usr.bin/openssl/req.c
+++ b/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: req.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: req.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -399,7 +399,7 @@ bad:
 		BIO_printf(bio_err, " -reqopt arg    - various request text options\n\n");
 		goto end;
 	}
-	ERR_load_crypto_strings();
+
 	if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 		BIO_printf(bio_err, "Error getting passwords\n");
 		goto end;
diff --git a/usr.bin/openssl/rsa.c b/usr.bin/openssl/rsa.c
index 677e35f8592..d8366aae7b0 100644
--- a/usr.bin/openssl/rsa.c
+++ b/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: rsa.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -227,7 +227,6 @@ bad:
 #endif
 		goto end;
 	}
-	ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
 	e = setup_engine(bio_err, engine, 0);
diff --git a/usr.bin/openssl/rsautl.c b/usr.bin/openssl/rsautl.c
index 7c83f1a82c1..322403064d1 100644
--- a/usr.bin/openssl/rsautl.c
+++ b/usr.bin/openssl/rsautl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsautl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: rsautl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -107,7 +107,6 @@ rsautl_main(int argc, char **argv)
 	argc--;
 	argv++;
 
-	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	pad = RSA_PKCS1_PADDING;
 
diff --git a/usr.bin/openssl/sess_id.c b/usr.bin/openssl/sess_id.c
index 23df0301b36..7c1fb771d1e 100644
--- a/usr.bin/openssl/sess_id.c
+++ b/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sess_id.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: sess_id.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -146,7 +146,7 @@ bad:
 			BIO_printf(bio_err, "%s", *pp);
 		goto end;
 	}
-	ERR_load_crypto_strings();
+
 	x = load_sess_id(infile, informat);
 	if (x == NULL) {
 		goto end;
diff --git a/usr.bin/openssl/spkac.c b/usr.bin/openssl/spkac.c
index 266ed576622..219b98d2ed6 100644
--- a/usr.bin/openssl/spkac.c
+++ b/usr.bin/openssl/spkac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkac.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: spkac.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999. Based on an original idea by Massimiliano Pala
  * (madwolf@openca.org).
@@ -167,7 +167,7 @@ bad:
 #endif
 		goto end;
 	}
-	ERR_load_crypto_strings();
+
 	if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
diff --git a/usr.bin/openssl/ts.c b/usr.bin/openssl/ts.c
index fab79b9ceeb..c765465c452 100644
--- a/usr.bin/openssl/ts.c
+++ b/usr.bin/openssl/ts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: ts.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -154,8 +154,6 @@ ts_main(int argc, char **argv)
 	/* Output is ContentInfo instead of TimeStampResp. */
 	int token_out = 0;
 
-	ERR_load_crypto_strings();
-
 	for (argc--, argv++; argc > 0; argc--, argv++) {
 		if (strcmp(*argv, "-config") == 0) {
 			if (argc-- < 1)
diff --git a/usr.bin/openssl/verify.c b/usr.bin/openssl/verify.c
index 057c4673723..689ee8e01ff 100644
--- a/usr.bin/openssl/verify.c
+++ b/usr.bin/openssl/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: verify.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -96,8 +96,6 @@ verify_main(int argc, char **argv)
 		goto end;
 	X509_STORE_set_verify_cb(cert_ctx, cb);
 
-	ERR_load_crypto_strings();
-
 	argc--;
 	argv++;
 	for (;;) {
diff --git a/usr.bin/openssl/x509.c b/usr.bin/openssl/x509.c
index afbccc00d6f..db3173e74d2 100644
--- a/usr.bin/openssl/x509.c
+++ b/usr.bin/openssl/x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: x509.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -446,8 +446,6 @@ bad:
 	e = setup_engine(bio_err, engine, 0);
 #endif
 
-	ERR_load_crypto_strings();
-
 	if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;