summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-07-12 17:54:31 +0000
committerjsing <>2014-07-12 17:54:31 +0000
commit60d855866ac8220edd815b7ca71575527f94d339 (patch)
tree7c04123f9b801e98ac816d7abe737855232beaba
parent9a6cbff11e469fd97a9dfc09e9d9970f0357b9fb (diff)
downloadopenbsd-60d855866ac8220edd815b7ca71575527f94d339.tar.gz
openbsd-60d855866ac8220edd815b7ca71575527f94d339.tar.bz2
openbsd-60d855866ac8220edd815b7ca71575527f94d339.zip
openssl(1) is only built as a single monolithic binary, so just call
load_config() once when we start. ok miod@
Diffstat
-rw-r--r--src/lib/libssl/src/apps/apps.c6
-rw-r--r--src/lib/libssl/src/apps/asn1pars.c5
-rw-r--r--src/lib/libssl/src/apps/ca.c5
-rw-r--r--src/lib/libssl/src/apps/ciphers.c4
-rw-r--r--src/lib/libssl/src/apps/cms.c5
-rw-r--r--src/lib/libssl/src/apps/crl.c5
-rw-r--r--src/lib/libssl/src/apps/dgst.c5
-rw-r--r--src/lib/libssl/src/apps/dh.c5
-rw-r--r--src/lib/libssl/src/apps/dhparam.c5
-rw-r--r--src/lib/libssl/src/apps/dsa.c5
-rw-r--r--src/lib/libssl/src/apps/dsaparam.c5
-rw-r--r--src/lib/libssl/src/apps/ec.c5
-rw-r--r--src/lib/libssl/src/apps/ecparam.c5
-rw-r--r--src/lib/libssl/src/apps/enc.c5
-rw-r--r--src/lib/libssl/src/apps/engine.c5
-rw-r--r--src/lib/libssl/src/apps/gendh.c5
-rw-r--r--src/lib/libssl/src/apps/gendsa.c5
-rw-r--r--src/lib/libssl/src/apps/genpkey.c5
-rw-r--r--src/lib/libssl/src/apps/genrsa.c5
-rw-r--r--src/lib/libssl/src/apps/ocsp.c5
-rw-r--r--src/lib/libssl/src/apps/openssl.c11
-rw-r--r--src/lib/libssl/src/apps/passwd.c5
-rw-r--r--src/lib/libssl/src/apps/pkcs12.c5
-rw-r--r--src/lib/libssl/src/apps/pkcs7.c5
-rw-r--r--src/lib/libssl/src/apps/pkcs8.c5
-rw-r--r--src/lib/libssl/src/apps/pkey.c5
-rw-r--r--src/lib/libssl/src/apps/pkeyparam.c5
-rw-r--r--src/lib/libssl/src/apps/pkeyutl.c5
-rw-r--r--src/lib/libssl/src/apps/rand.c5
-rw-r--r--src/lib/libssl/src/apps/rsa.c5
-rw-r--r--src/lib/libssl/src/apps/rsautl.c5
-rw-r--r--src/lib/libssl/src/apps/s_client.c5
-rw-r--r--src/lib/libssl/src/apps/s_server.c5
-rw-r--r--src/lib/libssl/src/apps/smime.c5
-rw-r--r--src/lib/libssl/src/apps/speed.c5
-rw-r--r--src/lib/libssl/src/apps/spkac.c5
-rw-r--r--src/lib/libssl/src/apps/ts.c5
-rw-r--r--src/lib/libssl/src/apps/verify.c5
-rw-r--r--src/lib/libssl/src/apps/x509.c5
39 files changed, 47 insertions, 154 deletions
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c
index a9dd83c094..84dd13339d 100644
--- a/src/lib/libssl/src/apps/apps.c
+++ b/src/lib/libssl/src/apps/apps.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: apps.c,v 1.64 2014/07/09 21:13:34 tedu Exp $ */ 1/* $OpenBSD: apps.c,v 1.65 2014/07/12 17:54:31 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 *
@@ -1298,9 +1298,9 @@ load_config(BIO *err, CONF *cnf)
1298 if (load_config_called) 1298 if (load_config_called)
1299 return 1; 1299 return 1;
1300 load_config_called = 1; 1300 load_config_called = 1;
1301 if (!cnf) 1301 if (cnf == NULL)
1302 cnf = config; 1302 cnf = config;
1303 if (!cnf) 1303 if (cnf == NULL)
1304 return 1; 1304 return 1;
1305 1305
1306 OPENSSL_load_builtin_modules(); 1306 OPENSSL_load_builtin_modules();
diff --git a/src/lib/libssl/src/apps/asn1pars.c b/src/lib/libssl/src/apps/asn1pars.c
index e805e3428d..1cedb6ad00 100644
--- a/src/lib/libssl/src/apps/asn1pars.c
+++ b/src/lib/libssl/src/apps/asn1pars.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1pars.c,v 1.25 2014/06/28 04:39:41 deraadt Exp $ */ 1/* $OpenBSD: asn1pars.c,v 1.26 2014/07/12 17:54:31 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 *
@@ -103,9 +103,6 @@ asn1parse_main(int argc, char **argv)
103 103
104 informat = FORMAT_PEM; 104 informat = FORMAT_PEM;
105 105
106 if (!load_config(bio_err, NULL))
107 goto end;
108
109 prog = argv[0]; 106 prog = argv[0];
110 argc--; 107 argc--;
111 argv++; 108 argv++;
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index a191c18211..8ebfd77f0a 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ca.c,v 1.61 2014/07/09 21:13:34 tedu Exp $ */ 1/* $OpenBSD: ca.c,v 1.62 2014/07/12 17:54:31 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 *
@@ -544,9 +544,6 @@ bad:
544 free(tofree); 544 free(tofree);
545 tofree = NULL; 545 tofree = NULL;
546 546
547 if (!load_config(bio_err, conf))
548 goto err;
549
550#ifndef OPENSSL_NO_ENGINE 547#ifndef OPENSSL_NO_ENGINE
551 e = setup_engine(bio_err, engine, 0); 548 e = setup_engine(bio_err, engine, 0);
552#endif 549#endif
diff --git a/src/lib/libssl/src/apps/ciphers.c b/src/lib/libssl/src/apps/ciphers.c
index 64675a63fd..0d791b2522 100644
--- a/src/lib/libssl/src/apps/ciphers.c
+++ b/src/lib/libssl/src/apps/ciphers.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ciphers.c,v 1.23 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: ciphers.c,v 1.24 2014/07/12 17:54:31 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 *
@@ -95,8 +95,6 @@ ciphers_main(int argc, char **argv)
95 meth = SSLv3_server_method(); 95 meth = SSLv3_server_method();
96 96
97 STDout = BIO_new_fp(stdout, BIO_NOCLOSE); 97 STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
98 if (!load_config(bio_err, NULL))
99 goto end;
100 98
101 argc--; 99 argc--;
102 argv++; 100 argv++;
diff --git a/src/lib/libssl/src/apps/cms.c b/src/lib/libssl/src/apps/cms.c
index 4a5f13ba20..bafbce1f5c 100644
--- a/src/lib/libssl/src/apps/cms.c
+++ b/src/lib/libssl/src/apps/cms.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms.c,v 1.18 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: cms.c,v 1.19 2014/07/12 17:54:31 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 */
@@ -144,9 +144,6 @@ cms_main(int argc, char **argv)
144 args = argv + 1; 144 args = argv + 1;
145 ret = 1; 145 ret = 1;
146 146
147 if (!load_config(bio_err, NULL))
148 goto end;
149
150 while (!badarg && *args && *args[0] == '-') { 147 while (!badarg && *args && *args[0] == '-') {
151 if (!strcmp(*args, "-encrypt")) 148 if (!strcmp(*args, "-encrypt"))
152 operation = SMIME_ENCRYPT; 149 operation = SMIME_ENCRYPT;
diff --git a/src/lib/libssl/src/apps/crl.c b/src/lib/libssl/src/apps/crl.c
index 5d7b12216c..05fd0878a4 100644
--- a/src/lib/libssl/src/apps/crl.c
+++ b/src/lib/libssl/src/apps/crl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: crl.c,v 1.23 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: crl.c,v 1.24 2014/07/12 17:54:31 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 *
@@ -124,9 +124,6 @@ crl_main(int argc, char **argv)
124 int do_ver = 0; 124 int do_ver = 0;
125 const EVP_MD *md_alg, *digest = EVP_sha1(); 125 const EVP_MD *md_alg, *digest = EVP_sha1();
126 126
127 if (!load_config(bio_err, NULL))
128 goto end;
129
130 if (bio_out == NULL) 127 if (bio_out == NULL)
131 if ((bio_out = BIO_new(BIO_s_file())) != NULL) { 128 if ((bio_out = BIO_new(BIO_s_file())) != NULL) {
132 BIO_set_fp(bio_out, stdout, BIO_NOCLOSE); 129 BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
diff --git a/src/lib/libssl/src/apps/dgst.c b/src/lib/libssl/src/apps/dgst.c
index 0858f96454..f9693fce16 100644
--- a/src/lib/libssl/src/apps/dgst.c
+++ b/src/lib/libssl/src/apps/dgst.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dgst.c,v 1.37 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: dgst.c,v 1.38 2014/07/12 17:54:31 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 *
@@ -134,9 +134,6 @@ dgst_main(int argc, char **argv)
134 goto end; 134 goto end;
135 } 135 }
136 136
137 if (!load_config(bio_err, NULL))
138 goto end;
139
140 /* first check the program name */ 137 /* first check the program name */
141 program_name(argv[0], pname, sizeof pname); 138 program_name(argv[0], pname, sizeof pname);
142 139
diff --git a/src/lib/libssl/src/apps/dh.c b/src/lib/libssl/src/apps/dh.c
index a5a9563470..5687c3cf2a 100644
--- a/src/lib/libssl/src/apps/dh.c
+++ b/src/lib/libssl/src/apps/dh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh.c,v 1.23 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: dh.c,v 1.24 2014/07/12 17:54:31 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 *
@@ -98,9 +98,6 @@ dh_main(int argc, char **argv)
98 char *engine; 98 char *engine;
99#endif 99#endif
100 100
101 if (!load_config(bio_err, NULL))
102 goto end;
103
104#ifndef OPENSSL_NO_ENGINE 101#ifndef OPENSSL_NO_ENGINE
105 engine = NULL; 102 engine = NULL;
106#endif 103#endif
diff --git a/src/lib/libssl/src/apps/dhparam.c b/src/lib/libssl/src/apps/dhparam.c
index 4bd888541b..b6b38f9b8f 100644
--- a/src/lib/libssl/src/apps/dhparam.c
+++ b/src/lib/libssl/src/apps/dhparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dhparam.c,v 1.31 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: dhparam.c,v 1.32 2014/07/12 17:54:31 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 *
@@ -160,9 +160,6 @@ dhparam_main(int argc, char **argv)
160#endif 160#endif
161 int num = 0, g = 0; 161 int num = 0, g = 0;
162 162
163 if (!load_config(bio_err, NULL))
164 goto end;
165
166 infile = NULL; 163 infile = NULL;
167 outfile = NULL; 164 outfile = NULL;
168 informat = FORMAT_PEM; 165 informat = FORMAT_PEM;
diff --git a/src/lib/libssl/src/apps/dsa.c b/src/lib/libssl/src/apps/dsa.c
index d667d6efb7..ab98c145a9 100644
--- a/src/lib/libssl/src/apps/dsa.c
+++ b/src/lib/libssl/src/apps/dsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa.c,v 1.26 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: dsa.c,v 1.27 2014/07/12 17:54:31 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 *
@@ -115,9 +115,6 @@ dsa_main(int argc, char **argv)
115 115
116 int pvk_encr = 2; 116 int pvk_encr = 2;
117 117
118 if (!load_config(bio_err, NULL))
119 goto end;
120
121#ifndef OPENSSL_NO_ENGINE 118#ifndef OPENSSL_NO_ENGINE
122 engine = NULL; 119 engine = NULL;
123#endif 120#endif
diff --git a/src/lib/libssl/src/apps/dsaparam.c b/src/lib/libssl/src/apps/dsaparam.c
index 217679f366..2322040a1e 100644
--- a/src/lib/libssl/src/apps/dsaparam.c
+++ b/src/lib/libssl/src/apps/dsaparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsaparam.c,v 1.32 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: dsaparam.c,v 1.33 2014/07/12 17:54:31 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 *
@@ -126,9 +126,6 @@ dsaparam_main(int argc, char **argv)
126 int timebomb = 0; 126 int timebomb = 0;
127#endif 127#endif
128 128
129 if (!load_config(bio_err, NULL))
130 goto end;
131
132 infile = NULL; 129 infile = NULL;
133 outfile = NULL; 130 outfile = NULL;
134 informat = FORMAT_PEM; 131 informat = FORMAT_PEM;
diff --git a/src/lib/libssl/src/apps/ec.c b/src/lib/libssl/src/apps/ec.c
index f160e69150..89e6f29350 100644
--- a/src/lib/libssl/src/apps/ec.c
+++ b/src/lib/libssl/src/apps/ec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec.c,v 1.14 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: ec.c,v 1.15 2014/07/12 17:54:31 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -103,9 +103,6 @@ ec_main(int argc, char **argv)
103 int asn1_flag = OPENSSL_EC_NAMED_CURVE; 103 int asn1_flag = OPENSSL_EC_NAMED_CURVE;
104 int new_asn1_flag = 0; 104 int new_asn1_flag = 0;
105 105
106 if (!load_config(bio_err, NULL))
107 goto end;
108
109 engine = NULL; 106 engine = NULL;
110 infile = NULL; 107 infile = NULL;
111 outfile = NULL; 108 outfile = NULL;
diff --git a/src/lib/libssl/src/apps/ecparam.c b/src/lib/libssl/src/apps/ecparam.c
index e00cb20539..c7d4647852 100644
--- a/src/lib/libssl/src/apps/ecparam.c
+++ b/src/lib/libssl/src/apps/ecparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecparam.c,v 1.21 2014/06/24 05:39:29 logan Exp $ */ 1/* $OpenBSD: ecparam.c,v 1.22 2014/07/12 17:54:31 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -135,9 +135,6 @@ ecparam_main(int argc, char **argv)
135 *ec_order = NULL, *ec_cofactor = NULL; 135 *ec_order = NULL, *ec_cofactor = NULL;
136 unsigned char *buffer = NULL; 136 unsigned char *buffer = NULL;
137 137
138 if (!load_config(bio_err, NULL))
139 goto end;
140
141 informat = FORMAT_PEM; 138 informat = FORMAT_PEM;
142 outformat = FORMAT_PEM; 139 outformat = FORMAT_PEM;
143 140
diff --git a/src/lib/libssl/src/apps/enc.c b/src/lib/libssl/src/apps/enc.c
index 4aa2c6a0ed..6b3aea554f 100644
--- a/src/lib/libssl/src/apps/enc.c
+++ b/src/lib/libssl/src/apps/enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: enc.c,v 1.36 2014/06/29 18:22:10 logan Exp $ */ 1/* $OpenBSD: enc.c,v 1.37 2014/07/12 17:54:31 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 *
@@ -130,9 +130,6 @@ enc_main(int argc, char **argv)
130#endif 130#endif
131 const EVP_MD *dgst = NULL; 131 const EVP_MD *dgst = NULL;
132 132
133 if (!load_config(bio_err, NULL))
134 goto end;
135
136 /* first check the program name */ 133 /* first check the program name */
137 program_name(argv[0], pname, sizeof pname); 134 program_name(argv[0], pname, sizeof pname);
138 if (strcmp(pname, "base64") == 0) 135 if (strcmp(pname, "base64") == 0)
diff --git a/src/lib/libssl/src/apps/engine.c b/src/lib/libssl/src/apps/engine.c
index 8a9ce83e5b..f6a30784f9 100644
--- a/src/lib/libssl/src/apps/engine.c
+++ b/src/lib/libssl/src/apps/engine.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: engine.c,v 1.24 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: engine.c,v 1.25 2014/07/12 17:54:31 jsing Exp $ */
2/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL 2/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -335,9 +335,6 @@ engine_main(int argc, char **argv)
335 335
336 SSL_load_error_strings(); 336 SSL_load_error_strings();
337 337
338 if (!load_config(bio_err, NULL))
339 goto end;
340
341 bio_out = BIO_new_fp(stdout, BIO_NOCLOSE); 338 bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
342 339
343 argc--; 340 argc--;
diff --git a/src/lib/libssl/src/apps/gendh.c b/src/lib/libssl/src/apps/gendh.c
index e5811718e3..5e7e44d798 100644
--- a/src/lib/libssl/src/apps/gendh.c
+++ b/src/lib/libssl/src/apps/gendh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gendh.c,v 1.26 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: gendh.c,v 1.27 2014/07/12 17:54:31 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 *
@@ -103,9 +103,6 @@ gendh_main(int argc, char **argv)
103 103
104 BN_GENCB_set(&cb, dh_cb, bio_err); 104 BN_GENCB_set(&cb, dh_cb, bio_err);
105 105
106 if (!load_config(bio_err, NULL))
107 goto end;
108
109 argv++; 106 argv++;
110 argc--; 107 argc--;
111 for (;;) { 108 for (;;) {
diff --git a/src/lib/libssl/src/apps/gendsa.c b/src/lib/libssl/src/apps/gendsa.c
index cb86c4ac3e..485462c292 100644
--- a/src/lib/libssl/src/apps/gendsa.c
+++ b/src/lib/libssl/src/apps/gendsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gendsa.c,v 1.28 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: gendsa.c,v 1.29 2014/07/12 17:54:31 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 *
@@ -92,9 +92,6 @@ gendsa_main(int argc, char **argv)
92 char *engine = NULL; 92 char *engine = NULL;
93#endif 93#endif
94 94
95 if (!load_config(bio_err, NULL))
96 goto end;
97
98 argv++; 95 argv++;
99 argc--; 96 argc--;
100 for (;;) { 97 for (;;) {
diff --git a/src/lib/libssl/src/apps/genpkey.c b/src/lib/libssl/src/apps/genpkey.c
index 1ee1947143..d386a87cb2 100644
--- a/src/lib/libssl/src/apps/genpkey.c
+++ b/src/lib/libssl/src/apps/genpkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: genpkey.c,v 1.11 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: genpkey.c,v 1.12 2014/07/12 17:54:31 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 */
@@ -95,9 +95,6 @@ genpkey_main(int argc, char **argv)
95 95
96 int do_param = 0; 96 int do_param = 0;
97 97
98 if (!load_config(bio_err, NULL))
99 goto end;
100
101 outformat = FORMAT_PEM; 98 outformat = FORMAT_PEM;
102 99
103 ERR_load_crypto_strings(); 100 ERR_load_crypto_strings();
diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index 7b670ece6b..dba1d8ccad 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: genrsa.c,v 1.35 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: genrsa.c,v 1.36 2014/07/12 17:54:31 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 *
@@ -114,9 +114,6 @@ genrsa_main(int argc, char **argv)
114 114
115 BN_GENCB_set(&cb, genrsa_cb, bio_err); 115 BN_GENCB_set(&cb, genrsa_cb, bio_err);
116 116
117 if (!load_config(bio_err, NULL))
118 goto err;
119
120 if ((out = BIO_new(BIO_s_file())) == NULL) { 117 if ((out = BIO_new(BIO_s_file())) == NULL) {
121 BIO_printf(bio_err, "unable to create BIO for output\n"); 118 BIO_printf(bio_err, "unable to create BIO for output\n");
122 goto err; 119 goto err;
diff --git a/src/lib/libssl/src/apps/ocsp.c b/src/lib/libssl/src/apps/ocsp.c
index c77b05f27d..6a6f5e225f 100644
--- a/src/lib/libssl/src/apps/ocsp.c
+++ b/src/lib/libssl/src/apps/ocsp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp.c,v 1.27 2014/06/28 04:39:41 deraadt Exp $ */ 1/* $OpenBSD: ocsp.c,v 1.28 2014/07/12 17:54:31 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 */
@@ -147,9 +147,6 @@ ocsp_main(int argc, char **argv)
147 const EVP_MD *cert_id_md = NULL; 147 const EVP_MD *cert_id_md = NULL;
148 const char *errstr = NULL; 148 const char *errstr = NULL;
149 149
150 if (!load_config(bio_err, NULL))
151 goto end;
152
153 SSL_load_error_strings(); 150 SSL_load_error_strings();
154 OpenSSL_add_ssl_algorithms(); 151 OpenSSL_add_ssl_algorithms();
155 152
diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c
index 9ebeaebbda..d35c8d8e19 100644
--- a/src/lib/libssl/src/apps/openssl.c
+++ b/src/lib/libssl/src/apps/openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: openssl.c,v 1.39 2014/07/10 09:15:51 tedu Exp $ */ 1/* $OpenBSD: openssl.c,v 1.40 2014/07/12 17:54:31 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 *
@@ -292,6 +292,12 @@ main(int argc, char **argv)
292 exit(1); 292 exit(1);
293 } 293 }
294 } 294 }
295
296 if (!load_config(bio_err, NULL)) {
297 BIO_printf(bio_err, "failed to load configuration\n");
298 goto end;
299 }
300
295 prog = prog_init(); 301 prog = prog_init();
296 302
297 /* first check the program name */ 303 /* first check the program name */
@@ -451,9 +457,6 @@ do_cmd(LHASH_OF(FUNCTION) * prog, int argc, char *argv[])
451 list_type = FUNC_TYPE_CIPHER; 457 list_type = FUNC_TYPE_CIPHER;
452 bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE); 458 bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
453 459
454 if (!load_config(bio_err, NULL))
455 goto end;
456
457 if (list_type == FUNC_TYPE_PKEY) 460 if (list_type == FUNC_TYPE_PKEY)
458 list_pkey(bio_stdout); 461 list_pkey(bio_stdout);
459 if (list_type == FUNC_TYPE_MD_ALG) 462 if (list_type == FUNC_TYPE_MD_ALG)
diff --git a/src/lib/libssl/src/apps/passwd.c b/src/lib/libssl/src/apps/passwd.c
index 5ac01859c4..bc77b49540 100644
--- a/src/lib/libssl/src/apps/passwd.c
+++ b/src/lib/libssl/src/apps/passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: passwd.c,v 1.21 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: passwd.c,v 1.22 2014/07/12 17:54:31 jsing Exp $ */
2 2
3#if defined OPENSSL_NO_MD5 3#if defined OPENSSL_NO_MD5
4#define NO_MD5CRYPT_1 4#define NO_MD5CRYPT_1
@@ -72,9 +72,6 @@ passwd_main(int argc, char **argv)
72 int usecrypt = 0, use1 = 0, useapr1 = 0; 72 int usecrypt = 0, use1 = 0, useapr1 = 0;
73 size_t pw_maxlen = 0; 73 size_t pw_maxlen = 0;
74 74
75 if (!load_config(bio_err, NULL))
76 goto err;
77
78 out = BIO_new(BIO_s_file()); 75 out = BIO_new(BIO_s_file());
79 if (out == NULL) 76 if (out == NULL)
80 goto err; 77 goto err;
diff --git a/src/lib/libssl/src/apps/pkcs12.c b/src/lib/libssl/src/apps/pkcs12.c
index 0e4bfbd895..35a5dd5bcc 100644
--- a/src/lib/libssl/src/apps/pkcs12.c
+++ b/src/lib/libssl/src/apps/pkcs12.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.c,v 1.36 2014/07/09 21:10:06 tedu Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.37 2014/07/12 17:54:31 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 */
@@ -134,9 +134,6 @@ pkcs12_main(int argc, char **argv)
134 134
135 enc = EVP_des_ede3_cbc(); 135 enc = EVP_des_ede3_cbc();
136 136
137 if (!load_config(bio_err, NULL))
138 goto end;
139
140 args = argv + 1; 137 args = argv + 1;
141 138
142 while (*args) { 139 while (*args) {
diff --git a/src/lib/libssl/src/apps/pkcs7.c b/src/lib/libssl/src/apps/pkcs7.c
index 83f1da8d3d..2e3377537b 100644
--- a/src/lib/libssl/src/apps/pkcs7.c
+++ b/src/lib/libssl/src/apps/pkcs7.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs7.c,v 1.19 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: pkcs7.c,v 1.20 2014/07/12 17:54:31 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 *
@@ -93,9 +93,6 @@ pkcs7_main(int argc, char **argv)
93 char *engine = NULL; 93 char *engine = NULL;
94#endif 94#endif
95 95
96 if (!load_config(bio_err, NULL))
97 goto end;
98
99 infile = NULL; 96 infile = NULL;
100 outfile = NULL; 97 outfile = NULL;
101 informat = FORMAT_PEM; 98 informat = FORMAT_PEM;
diff --git a/src/lib/libssl/src/apps/pkcs8.c b/src/lib/libssl/src/apps/pkcs8.c
index 6a4cf99fff..f33cd89ab1 100644
--- a/src/lib/libssl/src/apps/pkcs8.c
+++ b/src/lib/libssl/src/apps/pkcs8.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs8.c,v 1.19 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: pkcs8.c,v 1.20 2014/07/12 17:54:31 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 */
@@ -92,9 +92,6 @@ pkcs8_main(int argc, char **argv)
92 char *engine = NULL; 92 char *engine = NULL;
93#endif 93#endif
94 94
95 if (!load_config(bio_err, NULL))
96 goto end;
97
98 informat = FORMAT_PEM; 95 informat = FORMAT_PEM;
99 outformat = FORMAT_PEM; 96 outformat = FORMAT_PEM;
100 97
diff --git a/src/lib/libssl/src/apps/pkey.c b/src/lib/libssl/src/apps/pkey.c
index 2d4915c6e0..1769f62b0b 100644
--- a/src/lib/libssl/src/apps/pkey.c
+++ b/src/lib/libssl/src/apps/pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkey.c,v 1.9 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: pkey.c,v 1.10 2014/07/12 17:54:31 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 */
@@ -85,9 +85,6 @@ pkey_main(int argc, char **argv)
85#endif 85#endif
86 int ret = 1; 86 int ret = 1;
87 87
88 if (!load_config(bio_err, NULL))
89 goto end;
90
91 informat = FORMAT_PEM; 88 informat = FORMAT_PEM;
92 outformat = FORMAT_PEM; 89 outformat = FORMAT_PEM;
93 90
diff --git a/src/lib/libssl/src/apps/pkeyparam.c b/src/lib/libssl/src/apps/pkeyparam.c
index 4e48594a3d..6b1ce3d482 100644
--- a/src/lib/libssl/src/apps/pkeyparam.c
+++ b/src/lib/libssl/src/apps/pkeyparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkeyparam.c,v 1.7 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: pkeyparam.c,v 1.8 2014/07/12 17:54:31 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,9 +80,6 @@ pkeyparam_main(int argc, char **argv)
80#endif 80#endif
81 int ret = 1; 81 int ret = 1;
82 82
83 if (!load_config(bio_err, NULL))
84 goto end;
85
86 ERR_load_crypto_strings(); 83 ERR_load_crypto_strings();
87 OpenSSL_add_all_algorithms(); 84 OpenSSL_add_all_algorithms();
88 args = argv + 1; 85 args = argv + 1;
diff --git a/src/lib/libssl/src/apps/pkeyutl.c b/src/lib/libssl/src/apps/pkeyutl.c
index b8c6effac4..fa1a663928 100644
--- a/src/lib/libssl/src/apps/pkeyutl.c
+++ b/src/lib/libssl/src/apps/pkeyutl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkeyutl.c,v 1.12 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: pkeyutl.c,v 1.13 2014/07/12 17:54:31 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,9 +106,6 @@ pkeyutl_main(int argc, char **argv)
106 argc--; 106 argc--;
107 argv++; 107 argv++;
108 108
109 if (!load_config(bio_err, NULL))
110 goto end;
111
112 ERR_load_crypto_strings(); 109 ERR_load_crypto_strings();
113 OpenSSL_add_all_algorithms(); 110 OpenSSL_add_all_algorithms();
114 111
diff --git a/src/lib/libssl/src/apps/rand.c b/src/lib/libssl/src/apps/rand.c
index 0a886a734a..f4a7c020fd 100644
--- a/src/lib/libssl/src/apps/rand.c
+++ b/src/lib/libssl/src/apps/rand.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rand.c,v 1.20 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: rand.c,v 1.21 2014/07/12 17:54:31 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -85,9 +85,6 @@ rand_main(int argc, char **argv)
85 char *engine = NULL; 85 char *engine = NULL;
86#endif 86#endif
87 87
88 if (!load_config(bio_err, NULL))
89 goto err;
90
91 badopt = 0; 88 badopt = 0;
92 i = 0; 89 i = 0;
93 while (!badopt && argv[++i] != NULL) { 90 while (!badopt && argv[++i] != NULL) {
diff --git a/src/lib/libssl/src/apps/rsa.c b/src/lib/libssl/src/apps/rsa.c
index 2a9995ed5e..798283755f 100644
--- a/src/lib/libssl/src/apps/rsa.c
+++ b/src/lib/libssl/src/apps/rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa.c,v 1.25 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: rsa.c,v 1.26 2014/07/12 17:54:31 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 *
@@ -118,9 +118,6 @@ rsa_main(int argc, char **argv)
118 118
119 int pvk_encr = 2; 119 int pvk_encr = 2;
120 120
121 if (!load_config(bio_err, NULL))
122 goto end;
123
124 infile = NULL; 121 infile = NULL;
125 outfile = NULL; 122 outfile = NULL;
126 informat = FORMAT_PEM; 123 informat = FORMAT_PEM;
diff --git a/src/lib/libssl/src/apps/rsautl.c b/src/lib/libssl/src/apps/rsautl.c
index 85003780d0..966b7fe75f 100644
--- a/src/lib/libssl/src/apps/rsautl.c
+++ b/src/lib/libssl/src/apps/rsautl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsautl.c,v 1.22 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: rsautl.c,v 1.23 2014/07/12 17:54:31 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,9 +107,6 @@ rsautl_main(int argc, char **argv)
107 argc--; 107 argc--;
108 argv++; 108 argv++;
109 109
110 if (!load_config(bio_err, NULL))
111 goto end;
112
113 ERR_load_crypto_strings(); 110 ERR_load_crypto_strings();
114 OpenSSL_add_all_algorithms(); 111 OpenSSL_add_all_algorithms();
115 pad = RSA_PKCS1_PADDING; 112 pad = RSA_PKCS1_PADDING;
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index ec23b92754..b3fcbf17a0 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_client.c,v 1.66 2014/07/11 09:24:44 beck Exp $ */ 1/* $OpenBSD: s_client.c,v 1.67 2014/07/12 17:54:31 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 *
@@ -402,9 +402,6 @@ s_client_main(int argc, char **argv)
402 c_msg = 0; 402 c_msg = 0;
403 c_showcerts = 0; 403 c_showcerts = 0;
404 404
405 if (!load_config(bio_err, NULL))
406 goto end;
407
408 if (((cbuf = malloc(BUFSIZZ)) == NULL) || 405 if (((cbuf = malloc(BUFSIZZ)) == NULL) ||
409 ((sbuf = malloc(BUFSIZZ)) == NULL) || 406 ((sbuf = malloc(BUFSIZZ)) == NULL) ||
410 ((mbuf = malloc(BUFSIZZ + 1)) == NULL)) { /* NUL byte */ 407 ((mbuf = malloc(BUFSIZZ + 1)) == NULL)) { /* NUL byte */
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 802150a29a..136025ce63 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_server.c,v 1.58 2014/07/11 09:24:44 beck Exp $ */ 1/* $OpenBSD: s_server.c,v 1.59 2014/07/12 17:54:31 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 *
@@ -640,9 +640,6 @@ s_server_main(int argc, char *argv[])
640 640
641 s_server_init(); 641 s_server_init();
642 642
643 if (!load_config(bio_err, NULL))
644 goto end;
645
646 verify_depth = 0; 643 verify_depth = 0;
647 s_nbio = 0; 644 s_nbio = 0;
648 s_nbio_test = 0; 645 s_nbio_test = 0;
diff --git a/src/lib/libssl/src/apps/smime.c b/src/lib/libssl/src/apps/smime.c
index 927d82714e..92e379d3e3 100644
--- a/src/lib/libssl/src/apps/smime.c
+++ b/src/lib/libssl/src/apps/smime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: smime.c,v 1.26 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: smime.c,v 1.27 2014/07/12 17:54:31 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 */
@@ -121,9 +121,6 @@ smime_main(int argc, char **argv)
121 args = argv + 1; 121 args = argv + 1;
122 ret = 1; 122 ret = 1;
123 123
124 if (!load_config(bio_err, NULL))
125 goto end;
126
127 while (!badarg && *args && *args[0] == '-') { 124 while (!badarg && *args && *args[0] == '-') {
128 if (!strcmp(*args, "-encrypt")) 125 if (!strcmp(*args, "-encrypt"))
129 operation = SMIME_ENCRYPT; 126 operation = SMIME_ENCRYPT;
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index 8ff12b27c3..1258cc2581 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: speed.c,v 1.50 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: speed.c,v 1.51 2014/07/12 17:54:31 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 *
@@ -494,9 +494,6 @@ speed_main(int argc, char **argv)
494 ecdh_b[i] = NULL; 494 ecdh_b[i] = NULL;
495 } 495 }
496 496
497 if (!load_config(bio_err, NULL))
498 goto end;
499
500 memset(rsa_key, 0, sizeof(rsa_key)); 497 memset(rsa_key, 0, sizeof(rsa_key));
501 for (i = 0; i < RSA_NUM; i++) 498 for (i = 0; i < RSA_NUM; i++)
502 rsa_key[i] = NULL; 499 rsa_key[i] = NULL;
diff --git a/src/lib/libssl/src/apps/spkac.c b/src/lib/libssl/src/apps/spkac.c
index 96f6cd4a77..20492bb818 100644
--- a/src/lib/libssl/src/apps/spkac.c
+++ b/src/lib/libssl/src/apps/spkac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: spkac.c,v 1.19 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: spkac.c,v 1.20 2014/07/12 17:54:31 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).
@@ -97,9 +97,6 @@ spkac_main(int argc, char **argv)
97 char *engine = NULL; 97 char *engine = NULL;
98#endif 98#endif
99 99
100 if (!load_config(bio_err, NULL))
101 goto end;
102
103 prog = argv[0]; 100 prog = argv[0];
104 argc--; 101 argc--;
105 argv++; 102 argv++;
diff --git a/src/lib/libssl/src/apps/ts.c b/src/lib/libssl/src/apps/ts.c
index 0d42878fd7..9142242860 100644
--- a/src/lib/libssl/src/apps/ts.c
+++ b/src/lib/libssl/src/apps/ts.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts.c,v 1.17 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: ts.c,v 1.18 2014/07/12 17:54:31 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 */
@@ -156,9 +156,6 @@ ts_main(int argc, char **argv)
156 156
157 ERR_load_crypto_strings(); 157 ERR_load_crypto_strings();
158 158
159 if (!load_config(bio_err, NULL))
160 goto cleanup;
161
162 for (argc--, argv++; argc > 0; argc--, argv++) { 159 for (argc--, argv++; argc > 0; argc--, argv++) {
163 if (strcmp(*argv, "-config") == 0) { 160 if (strcmp(*argv, "-config") == 0) {
164 if (argc-- < 1) 161 if (argc-- < 1)
diff --git a/src/lib/libssl/src/apps/verify.c b/src/lib/libssl/src/apps/verify.c
index 4802392cb1..1fae9dd933 100644
--- a/src/lib/libssl/src/apps/verify.c
+++ b/src/lib/libssl/src/apps/verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: verify.c,v 1.24 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: verify.c,v 1.25 2014/07/12 17:54:31 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 *
@@ -98,9 +98,6 @@ verify_main(int argc, char **argv)
98 98
99 ERR_load_crypto_strings(); 99 ERR_load_crypto_strings();
100 100
101 if (!load_config(bio_err, NULL))
102 goto end;
103
104 argc--; 101 argc--;
105 argv++; 102 argv++;
106 for (;;) { 103 for (;;) {
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c
index e6b33c7a19..647aa9c0f8 100644
--- a/src/lib/libssl/src/apps/x509.c
+++ b/src/lib/libssl/src/apps/x509.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.c,v 1.47 2014/07/09 21:02:35 tedu Exp $ */ 1/* $OpenBSD: x509.c,v 1.48 2014/07/12 17:54:31 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,9 +209,6 @@ x509_main(int argc, char **argv)
209 209
210 reqfile = 0; 210 reqfile = 0;
211 211
212 if (!load_config(bio_err, NULL))
213 goto end;
214
215 STDout = BIO_new_fp(stdout, BIO_NOCLOSE); 212 STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
216 213
217 informat = FORMAT_PEM; 214 informat = FORMAT_PEM;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 20:22:26 +0000