summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-08-28 14:23:52 +0000
committerjsing <>2014-08-28 14:23:52 +0000
commit3a2884e89a931573761460cdda84faf509e7ecd3 (patch)
tree5ac74b73de2223699514f57dae53d0bee08b0eb0 /src
parent31c9e04aeb255ae1ae51c6f06be5e4714c9e9054 (diff)
downloadopenbsd-3a2884e89a931573761460cdda84faf509e7ecd3.tar.gz
openbsd-3a2884e89a931573761460cdda84faf509e7ecd3.tar.bz2
openbsd-3a2884e89a931573761460cdda84faf509e7ecd3.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/asn1pars.c3
-rw-r--r--src/usr.bin/openssl/ca.c3
-rw-r--r--src/usr.bin/openssl/crl.c3
-rw-r--r--src/usr.bin/openssl/crl2p7.c3
-rw-r--r--src/usr.bin/openssl/dh.c3
-rw-r--r--src/usr.bin/openssl/dhparam.c3
-rw-r--r--src/usr.bin/openssl/dsa.c3
-rw-r--r--src/usr.bin/openssl/dsaparam.c3
-rw-r--r--src/usr.bin/openssl/ec.c3
-rw-r--r--src/usr.bin/openssl/ecparam.c3
-rw-r--r--src/usr.bin/openssl/genpkey.c3
-rw-r--r--src/usr.bin/openssl/genrsa.c3
-rw-r--r--src/usr.bin/openssl/nseq.c4
-rw-r--r--src/usr.bin/openssl/pkcs12.c5
-rw-r--r--src/usr.bin/openssl/pkcs7.c3
-rw-r--r--src/usr.bin/openssl/pkcs8.c3
-rw-r--r--src/usr.bin/openssl/pkey.c3
-rw-r--r--src/usr.bin/openssl/pkeyparam.c3
-rw-r--r--src/usr.bin/openssl/pkeyutl.c3
-rw-r--r--src/usr.bin/openssl/req.c4
-rw-r--r--src/usr.bin/openssl/rsa.c3
-rw-r--r--src/usr.bin/openssl/rsautl.c3
-rw-r--r--src/usr.bin/openssl/sess_id.c4
-rw-r--r--src/usr.bin/openssl/spkac.c4
-rw-r--r--src/usr.bin/openssl/ts.c4
-rw-r--r--src/usr.bin/openssl/verify.c4
-rw-r--r--src/usr.bin/openssl/x509.c4
27 files changed, 30 insertions, 60 deletions
diff --git a/src/usr.bin/openssl/asn1pars.c b/src/usr.bin/openssl/asn1pars.c
index 6ba43afb97..e6d5339f66 100644
--- a/src/usr.bin/openssl/asn1pars.c
+++ b/src/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1pars.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: asn1pars.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -193,7 +193,6 @@ bad:
193 BIO_printf(bio_err, " -genconf file file to generate ASN1 structure from\n"); 193 BIO_printf(bio_err, " -genconf file file to generate ASN1 structure from\n");
194 goto end; 194 goto end;
195 } 195 }
196 ERR_load_crypto_strings();
197 196
198 in = BIO_new(BIO_s_file()); 197 in = BIO_new(BIO_s_file());
199 out = BIO_new(BIO_s_file()); 198 out = BIO_new(BIO_s_file());
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c
index c19ecc6616..e895eab9e0 100644
--- a/src/usr.bin/openssl/ca.c
+++ b/src/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ca.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: ca.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -513,7 +513,6 @@ bad:
513 BIO_printf(bio_err, "%s", *pp2); 513 BIO_printf(bio_err, "%s", *pp2);
514 goto err; 514 goto err;
515 } 515 }
516 ERR_load_crypto_strings();
517 516
518 /*****************************************************************/ 517 /*****************************************************************/
519 tofree = NULL; 518 tofree = NULL;
diff --git a/src/usr.bin/openssl/crl.c b/src/usr.bin/openssl/crl.c
index ef0198c733..ba2e479b86 100644
--- a/src/usr.bin/openssl/crl.c
+++ b/src/usr.bin/openssl/crl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: crl.c,v 1.2 2014/08/28 14:01:32 jsing Exp $ */ 1/* $OpenBSD: crl.c,v 1.3 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -272,7 +272,6 @@ crl_main(int argc, char **argv)
272 } 272 }
273 } 273 }
274 274
275 ERR_load_crypto_strings();
276 x = load_crl(crl_config.infile, crl_config.informat); 275 x = load_crl(crl_config.infile, crl_config.informat);
277 if (x == NULL) 276 if (x == NULL)
278 goto end; 277 goto end;
diff --git a/src/usr.bin/openssl/crl2p7.c b/src/usr.bin/openssl/crl2p7.c
index 7fdb6ccfd4..b2c114aac8 100644
--- a/src/usr.bin/openssl/crl2p7.c
+++ b/src/usr.bin/openssl/crl2p7.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: crl2p7.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: crl2p7.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -155,7 +155,6 @@ bad:
155 ret = 1; 155 ret = 1;
156 goto end; 156 goto end;
157 } 157 }
158 ERR_load_crypto_strings();
159 158
160 in = BIO_new(BIO_s_file()); 159 in = BIO_new(BIO_s_file());
161 out = BIO_new(BIO_s_file()); 160 out = BIO_new(BIO_s_file());
diff --git a/src/usr.bin/openssl/dh.c b/src/usr.bin/openssl/dh.c
index 447b4c800f..ce10998090 100644
--- a/src/usr.bin/openssl/dh.c
+++ b/src/usr.bin/openssl/dh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: dh.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -168,7 +168,6 @@ bad:
168#endif 168#endif
169 goto end; 169 goto end;
170 } 170 }
171 ERR_load_crypto_strings();
172 171
173#ifndef OPENSSL_NO_ENGINE 172#ifndef OPENSSL_NO_ENGINE
174 setup_engine(bio_err, engine, 0); 173 setup_engine(bio_err, engine, 0);
diff --git a/src/usr.bin/openssl/dhparam.c b/src/usr.bin/openssl/dhparam.c
index 0022f72670..468fa00419 100644
--- a/src/usr.bin/openssl/dhparam.c
+++ b/src/usr.bin/openssl/dhparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dhparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: dhparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -234,7 +234,6 @@ bad:
234 BIO_printf(bio_err, " -noout no output\n"); 234 BIO_printf(bio_err, " -noout no output\n");
235 goto end; 235 goto end;
236 } 236 }
237 ERR_load_crypto_strings();
238 237
239#ifndef OPENSSL_NO_ENGINE 238#ifndef OPENSSL_NO_ENGINE
240 setup_engine(bio_err, engine, 0); 239 setup_engine(bio_err, engine, 0);
diff --git a/src/usr.bin/openssl/dsa.c b/src/usr.bin/openssl/dsa.c
index b8ca7dd2ef..a84b25503b 100644
--- a/src/usr.bin/openssl/dsa.c
+++ b/src/usr.bin/openssl/dsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: dsa.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -215,7 +215,6 @@ bad:
215 BIO_printf(bio_err, " -modulus print the DSA public value\n"); 215 BIO_printf(bio_err, " -modulus print the DSA public value\n");
216 goto end; 216 goto end;
217 } 217 }
218 ERR_load_crypto_strings();
219 218
220#ifndef OPENSSL_NO_ENGINE 219#ifndef OPENSSL_NO_ENGINE
221 e = setup_engine(bio_err, engine, 0); 220 e = setup_engine(bio_err, engine, 0);
diff --git a/src/usr.bin/openssl/dsaparam.c b/src/usr.bin/openssl/dsaparam.c
index 5c17a2c9ac..ccb533421a 100644
--- a/src/usr.bin/openssl/dsaparam.c
+++ b/src/usr.bin/openssl/dsaparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsaparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: dsaparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -209,7 +209,6 @@ bad:
209 BIO_printf(bio_err, " number number of bits to use for generating private key\n"); 209 BIO_printf(bio_err, " number number of bits to use for generating private key\n");
210 goto end; 210 goto end;
211 } 211 }
212 ERR_load_crypto_strings();
213 212
214 in = BIO_new(BIO_s_file()); 213 in = BIO_new(BIO_s_file());
215 out = BIO_new(BIO_s_file()); 214 out = BIO_new(BIO_s_file());
diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c
index f1bdf55e33..063e57c818 100644
--- a/src/usr.bin/openssl/ec.c
+++ b/src/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: ec.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -226,7 +226,6 @@ bad:
226 "explicit\n"); 226 "explicit\n");
227 goto end; 227 goto end;
228 } 228 }
229 ERR_load_crypto_strings();
230 229
231#ifndef OPENSSL_NO_ENGINE 230#ifndef OPENSSL_NO_ENGINE
232 setup_engine(bio_err, engine, 0); 231 setup_engine(bio_err, engine, 0);
diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c
index 9623cb96ce..782069a8e5 100644
--- a/src/usr.bin/openssl/ecparam.c
+++ b/src/usr.bin/openssl/ecparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecparam.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: ecparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -262,7 +262,6 @@ bad:
262 "possibly a hardware device\n"); 262 "possibly a hardware device\n");
263 goto end; 263 goto end;
264 } 264 }
265 ERR_load_crypto_strings();
266 265
267 in = BIO_new(BIO_s_file()); 266 in = BIO_new(BIO_s_file());
268 out = BIO_new(BIO_s_file()); 267 out = BIO_new(BIO_s_file());
diff --git a/src/usr.bin/openssl/genpkey.c b/src/usr.bin/openssl/genpkey.c
index 02332f6682..09b130e83a 100644
--- a/src/usr.bin/openssl/genpkey.c
+++ b/src/usr.bin/openssl/genpkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: genpkey.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: genpkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006 3 * project 2006
4 */ 4 */
@@ -97,7 +97,6 @@ genpkey_main(int argc, char **argv)
97 97
98 outformat = FORMAT_PEM; 98 outformat = FORMAT_PEM;
99 99
100 ERR_load_crypto_strings();
101 OpenSSL_add_all_algorithms(); 100 OpenSSL_add_all_algorithms();
102 args = argv + 1; 101 args = argv + 1;
103 while (!badarg && *args && *args[0] == '-') { 102 while (!badarg && *args && *args[0] == '-') {
diff --git a/src/usr.bin/openssl/genrsa.c b/src/usr.bin/openssl/genrsa.c
index 7844fb815f..b7534a0a5e 100644
--- a/src/usr.bin/openssl/genrsa.c
+++ b/src/usr.bin/openssl/genrsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: genrsa.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: genrsa.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -198,7 +198,6 @@ bad:
198#endif 198#endif
199 goto err; 199 goto err;
200 } 200 }
201 ERR_load_crypto_strings();
202 201
203 if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) { 202 if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
204 BIO_printf(bio_err, "Error getting password\n"); 203 BIO_printf(bio_err, "Error getting password\n");
diff --git a/src/usr.bin/openssl/nseq.c b/src/usr.bin/openssl/nseq.c
index 6c32f7c4b4..6bc58185c0 100644
--- a/src/usr.bin/openssl/nseq.c
+++ b/src/usr.bin/openssl/nseq.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: nseq.c,v 1.1 2014/08/26 17:47:24 jsing Exp $ */ 1/* $OpenBSD: nseq.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -77,8 +77,6 @@ nseq_main(int argc, char **argv)
77 int i, ret = 1; 77 int i, ret = 1;
78 int badarg = 0; 78 int badarg = 0;
79 79
80 ERR_load_crypto_strings();
81
82 args = argv + 1; 80 args = argv + 1;
83 while (!badarg && *args && *args[0] == '-') { 81 while (!badarg && *args && *args[0] == '-') {
84 if (!strcmp(*args, "-toseq")) 82 if (!strcmp(*args, "-toseq"))
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index 77b7c31d01..41924a9698 100644
--- a/src/usr.bin/openssl/pkcs12.c
+++ b/src/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -386,9 +386,6 @@ pkcs12_main(int argc, char **argv)
386 mpass = macpass; 386 mpass = macpass;
387 } 387 }
388 388
389 ERR_load_crypto_strings();
390
391
392 if (!infile) 389 if (!infile)
393 in = BIO_new_fp(stdin, BIO_NOCLOSE); 390 in = BIO_new_fp(stdin, BIO_NOCLOSE);
394 else 391 else
diff --git a/src/usr.bin/openssl/pkcs7.c b/src/usr.bin/openssl/pkcs7.c
index 2c2af168a9..70b58d8b84 100644
--- a/src/usr.bin/openssl/pkcs7.c
+++ b/src/usr.bin/openssl/pkcs7.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs7.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkcs7.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -159,7 +159,6 @@ bad:
159 ret = 1; 159 ret = 1;
160 goto end; 160 goto end;
161 } 161 }
162 ERR_load_crypto_strings();
163 162
164#ifndef OPENSSL_NO_ENGINE 163#ifndef OPENSSL_NO_ENGINE
165 setup_engine(bio_err, engine, 0); 164 setup_engine(bio_err, engine, 0);
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c
index 1715fe1d6b..c2aefdc152 100644
--- a/src/usr.bin/openssl/pkcs8.c
+++ b/src/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs8.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkcs8.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999-2004. 3 * project 1999-2004.
4 */ 4 */
@@ -95,7 +95,6 @@ pkcs8_main(int argc, char **argv)
95 informat = FORMAT_PEM; 95 informat = FORMAT_PEM;
96 outformat = FORMAT_PEM; 96 outformat = FORMAT_PEM;
97 97
98 ERR_load_crypto_strings();
99 OpenSSL_add_all_algorithms(); 98 OpenSSL_add_all_algorithms();
100 args = argv + 1; 99 args = argv + 1;
101 while (!badarg && *args && *args[0] == '-') { 100 while (!badarg && *args && *args[0] == '-') {
diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c
index 7f13bbbf62..4fbc722329 100644
--- a/src/usr.bin/openssl/pkey.c
+++ b/src/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkey.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006 3 * project 2006
4 */ 4 */
@@ -88,7 +88,6 @@ pkey_main(int argc, char **argv)
88 informat = FORMAT_PEM; 88 informat = FORMAT_PEM;
89 outformat = FORMAT_PEM; 89 outformat = FORMAT_PEM;
90 90
91 ERR_load_crypto_strings();
92 OpenSSL_add_all_algorithms(); 91 OpenSSL_add_all_algorithms();
93 args = argv + 1; 92 args = argv + 1;
94 while (!badarg && *args && *args[0] == '-') { 93 while (!badarg && *args && *args[0] == '-') {
diff --git a/src/usr.bin/openssl/pkeyparam.c b/src/usr.bin/openssl/pkeyparam.c
index c48f1a95dd..1e60430b26 100644
--- a/src/usr.bin/openssl/pkeyparam.c
+++ b/src/usr.bin/openssl/pkeyparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkeyparam.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkeyparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006 3 * project 2006
4 */ 4 */
@@ -80,7 +80,6 @@ pkeyparam_main(int argc, char **argv)
80#endif 80#endif
81 int ret = 1; 81 int ret = 1;
82 82
83 ERR_load_crypto_strings();
84 OpenSSL_add_all_algorithms(); 83 OpenSSL_add_all_algorithms();
85 args = argv + 1; 84 args = argv + 1;
86 while (!badarg && *args && *args[0] == '-') { 85 while (!badarg && *args && *args[0] == '-') {
diff --git a/src/usr.bin/openssl/pkeyutl.c b/src/usr.bin/openssl/pkeyutl.c
index 5fff008db6..f233d76dda 100644
--- a/src/usr.bin/openssl/pkeyutl.c
+++ b/src/usr.bin/openssl/pkeyutl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkeyutl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkeyutl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -106,7 +106,6 @@ pkeyutl_main(int argc, char **argv)
106 argc--; 106 argc--;
107 argv++; 107 argv++;
108 108
109 ERR_load_crypto_strings();
110 OpenSSL_add_all_algorithms(); 109 OpenSSL_add_all_algorithms();
111 110
112 while (argc >= 1) { 111 while (argc >= 1) {
diff --git a/src/usr.bin/openssl/req.c b/src/usr.bin/openssl/req.c
index 87599b35e1..98f3e1d84c 100644
--- a/src/usr.bin/openssl/req.c
+++ b/src/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: req.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: req.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -399,7 +399,7 @@ bad:
399 BIO_printf(bio_err, " -reqopt arg - various request text options\n\n"); 399 BIO_printf(bio_err, " -reqopt arg - various request text options\n\n");
400 goto end; 400 goto end;
401 } 401 }
402 ERR_load_crypto_strings(); 402
403 if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { 403 if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
404 BIO_printf(bio_err, "Error getting passwords\n"); 404 BIO_printf(bio_err, "Error getting passwords\n");
405 goto end; 405 goto end;
diff --git a/src/usr.bin/openssl/rsa.c b/src/usr.bin/openssl/rsa.c
index 677e35f859..d8366aae7b 100644
--- a/src/usr.bin/openssl/rsa.c
+++ b/src/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: rsa.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -227,7 +227,6 @@ bad:
227#endif 227#endif
228 goto end; 228 goto end;
229 } 229 }
230 ERR_load_crypto_strings();
231 230
232#ifndef OPENSSL_NO_ENGINE 231#ifndef OPENSSL_NO_ENGINE
233 e = setup_engine(bio_err, engine, 0); 232 e = setup_engine(bio_err, engine, 0);
diff --git a/src/usr.bin/openssl/rsautl.c b/src/usr.bin/openssl/rsautl.c
index 7c83f1a82c..322403064d 100644
--- a/src/usr.bin/openssl/rsautl.c
+++ b/src/usr.bin/openssl/rsautl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsautl.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: rsautl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -107,7 +107,6 @@ rsautl_main(int argc, char **argv)
107 argc--; 107 argc--;
108 argv++; 108 argv++;
109 109
110 ERR_load_crypto_strings();
111 OpenSSL_add_all_algorithms(); 110 OpenSSL_add_all_algorithms();
112 pad = RSA_PKCS1_PADDING; 111 pad = RSA_PKCS1_PADDING;
113 112
diff --git a/src/usr.bin/openssl/sess_id.c b/src/usr.bin/openssl/sess_id.c
index 23df0301b3..7c1fb771d1 100644
--- a/src/usr.bin/openssl/sess_id.c
+++ b/src/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sess_id.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: sess_id.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -146,7 +146,7 @@ bad:
146 BIO_printf(bio_err, "%s", *pp); 146 BIO_printf(bio_err, "%s", *pp);
147 goto end; 147 goto end;
148 } 148 }
149 ERR_load_crypto_strings(); 149
150 x = load_sess_id(infile, informat); 150 x = load_sess_id(infile, informat);
151 if (x == NULL) { 151 if (x == NULL) {
152 goto end; 152 goto end;
diff --git a/src/usr.bin/openssl/spkac.c b/src/usr.bin/openssl/spkac.c
index 266ed57662..219b98d2ed 100644
--- a/src/usr.bin/openssl/spkac.c
+++ b/src/usr.bin/openssl/spkac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: spkac.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: spkac.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. Based on an original idea by Massimiliano Pala 3 * project 1999. Based on an original idea by Massimiliano Pala
4 * (madwolf@openca.org). 4 * (madwolf@openca.org).
@@ -167,7 +167,7 @@ bad:
167#endif 167#endif
168 goto end; 168 goto end;
169 } 169 }
170 ERR_load_crypto_strings(); 170
171 if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) { 171 if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
172 BIO_printf(bio_err, "Error getting password\n"); 172 BIO_printf(bio_err, "Error getting password\n");
173 goto end; 173 goto end;
diff --git a/src/usr.bin/openssl/ts.c b/src/usr.bin/openssl/ts.c
index fab79b9cee..c765465c45 100644
--- a/src/usr.bin/openssl/ts.c
+++ b/src/usr.bin/openssl/ts.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: ts.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -154,8 +154,6 @@ ts_main(int argc, char **argv)
154 /* Output is ContentInfo instead of TimeStampResp. */ 154 /* Output is ContentInfo instead of TimeStampResp. */
155 int token_out = 0; 155 int token_out = 0;
156 156
157 ERR_load_crypto_strings();
158
159 for (argc--, argv++; argc > 0; argc--, argv++) { 157 for (argc--, argv++; argc > 0; argc--, argv++) {
160 if (strcmp(*argv, "-config") == 0) { 158 if (strcmp(*argv, "-config") == 0) {
161 if (argc-- < 1) 159 if (argc-- < 1)
diff --git a/src/usr.bin/openssl/verify.c b/src/usr.bin/openssl/verify.c
index 057c467372..689ee8e01f 100644
--- a/src/usr.bin/openssl/verify.c
+++ b/src/usr.bin/openssl/verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: verify.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: verify.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -96,8 +96,6 @@ verify_main(int argc, char **argv)
96 goto end; 96 goto end;
97 X509_STORE_set_verify_cb(cert_ctx, cb); 97 X509_STORE_set_verify_cb(cert_ctx, cb);
98 98
99 ERR_load_crypto_strings();
100
101 argc--; 99 argc--;
102 argv++; 100 argv++;
103 for (;;) { 101 for (;;) {
diff --git a/src/usr.bin/openssl/x509.c b/src/usr.bin/openssl/x509.c
index afbccc00d6..db3173e74d 100644
--- a/src/usr.bin/openssl/x509.c
+++ b/src/usr.bin/openssl/x509.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: x509.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -446,8 +446,6 @@ bad:
446 e = setup_engine(bio_err, engine, 0); 446 e = setup_engine(bio_err, engine, 0);
447#endif 447#endif
448 448
449 ERR_load_crypto_strings();
450
451 if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) { 449 if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
452 BIO_printf(bio_err, "Error getting password\n"); 450 BIO_printf(bio_err, "Error getting password\n");
453 goto end; 451 goto end;