wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Centralise loading default apps config file

Browse source 
Loading the config file after processing command line options can
cause problems, e.g. where an engine provides new ciphers/digests
these are not then recoginised on the command line. Move the
default config file loading to before the command line option
processing. Whilst we're doing this we might as well centralise
this instead of doing it individually for each application. Finally
if we do it before the OpenSSL_add_ssl_algorithms() call then
ciphersuites provided by an engine (e.g. GOST) can be available to
the apps.

RT#4085
RT#4086

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-10-12 12:40:15 +01:00
parent d175e8a6c2
commit a0a82324f9
38 changed files with 19 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/asn1pars.c
View file

@ -186,9 +186,6 @@ int asn1parse_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (oidfile != NULL) {
in = bio_open_default(oidfile, 'r', FORMAT_TEXT);
if (in == NULL)

11
apps/ca.c
View file

@ -484,10 +484,13 @@ end_of_options:
argv = opt_rest();
BIO_printf(bio_err, "Using configuration from %s\n", configfile);
if ((conf = app_load_config(configfile)) == NULL)
goto end;
if (!app_load_modules(conf))
goto end;
/* We already loaded the default config file */
if (configfile != default_config_file) {
if ((conf = app_load_config(configfile)) == NULL)
goto end;
if (!app_load_modules(conf))
goto end;
}
/* Lets get the config section we are using */
if (section == NULL) {

3
apps/ciphers.c
View file

@ -144,9 +144,6 @@ int ciphers_main(int argc, char **argv)
else if (argc != 0)
goto opthelp;
if (!app_load_modules(NULL))
goto end;
ctx = SSL_CTX_new(meth);
if (ctx == NULL)
goto err;

3
apps/cms.c
View file

@ -684,9 +684,6 @@ int cms_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
if (need_rand) {
app_RAND_load_file(NULL, (inrand != NULL));
if (inrand != NULL)

3
apps/crl.c
View file

@ -232,9 +232,6 @@ int crl_main(int argc, char **argv)
if (!nmflag_set)
nmflag = XN_FLAG_ONELINE;
if (!app_load_modules(NULL))
goto end;
x = load_crl(infile, informat);
if (x == NULL)
goto end;

3
apps/crl2p7.c
View file

@ -148,9 +148,6 @@ int crl2pkcs7_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (!nocrl) {
in = bio_open_default(infile, 'r', informat);
if (in == NULL)

3
apps/dgst.c
View file

@ -236,9 +236,6 @@ int dgst_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (do_verify && !sigfile) {
BIO_printf(bio_err,
"No signature to verify: use the -signature option\n");

3
apps/dhparam.c
View file

@ -230,9 +230,6 @@ int dhparam_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (argv[0] && (!opt_int(argv[0], &num) || num <= 0))
goto end;

3
apps/dsa.c
View file

@ -202,9 +202,6 @@ int dsa_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
BIO_printf(bio_err, "read DSA key\n");
{
EVP_PKEY *pkey;

3
apps/dsaparam.c
View file

@ -183,9 +183,6 @@ int dsaparam_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (argc == 1) {
if (!opt_int(argv[0], &num))
goto end;

3
apps/ec.c
View file

@ -202,9 +202,6 @@ int ec_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
in = bio_open_default(infile, 'r', informat);
if (in == NULL)
goto end;

3
apps/ecparam.c
View file

@ -220,9 +220,6 @@ int ecparam_main(int argc, char **argv)
argv = opt_rest();
private = genkey ? 1 : 0;
if (!app_load_modules(NULL))
goto end;
in = bio_open_default(infile, 'r', informat);
if (in == NULL)
goto end;

3
apps/enc.c
View file

@ -295,9 +295,6 @@ int enc_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (cipher && EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) {
BIO_printf(bio_err, "%s: AEAD ciphers not supported\n", prog);
goto end;

3
apps/engine.c
View file

@ -369,9 +369,6 @@ int engine_main(int argc, char **argv)
}
}
if (!app_load_modules(NULL))
goto end;
for (i = 0; i < sk_OPENSSL_STRING_num(engines); i++) {
const char *id = sk_OPENSSL_STRING_value(engines, i);
if ((e = ENGINE_by_id(id)) != NULL) {

3
apps/gendsa.c
View file

@ -144,9 +144,6 @@ int gendsa_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
in = bio_open_default(dsaparams, 'r', FORMAT_PEM);
if (in == NULL)
goto end2;

3
apps/genpkey.c
View file

@ -181,9 +181,6 @@ int genpkey_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
out = bio_open_owner(outfile, outformat, private);
if (out == NULL)
goto end;

3
apps/genrsa.c
View file

@ -169,9 +169,6 @@ int genrsa_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
out = bio_open_owner(outfile, FORMAT_PEM, private);
if (out == NULL)
goto end;

3
apps/nseq.c
View file

@ -109,9 +109,6 @@ int nseq_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
in = bio_open_default(infile, 'r', FORMAT_PEM);
if (in == NULL)
goto end;

3
apps/ocsp.c
View file

@ -494,9 +494,6 @@ int ocsp_main(int argc, char **argv)
if (!req && !reqin && !respin && !(port && ridx_filename))
goto opthelp;
if (!app_load_modules(NULL))
goto end;
out = bio_open_default(outfile, 'w', FORMAT_TEXT);
if (out == NULL)
goto end;

14
apps/openssl.c
View file

@ -166,7 +166,7 @@ BIO *bio_in = NULL;
BIO *bio_out = NULL;
BIO *bio_err = NULL;
static void apps_startup()
static int apps_startup()
{
#ifdef SIGPIPE
signal(SIGPIPE, SIG_IGN);
@ -174,6 +174,13 @@ static void apps_startup()
CRYPTO_malloc_init();
ERR_load_crypto_strings();
ERR_load_SSL_strings();
if (!app_load_modules(NULL)) {
ERR_print_errors(bio_err);
BIO_printf(bio_err, "Error loading default configuration\n");
return 0;
}
OpenSSL_add_all_algorithms();
OpenSSL_add_ssl_algorithms();
OPENSSL_load_builtin_modules();
@ -182,6 +189,7 @@ static void apps_startup()
#ifndef OPENSSL_NO_ENGINE
ENGINE_load_builtin_engines();
#endif
return 1;
}
static void apps_shutdown()
@ -328,7 +336,9 @@ int main(int argc, char *argv[])
#endif
}
apps_startup();
if (!apps_startup())
goto end;
prog = prog_init();
pname = opt_progname(argv[0]);

3
apps/passwd.c
View file

@ -201,9 +201,6 @@ int passwd_main(int argc, char **argv)
goto opthelp;
# endif
if (!app_load_modules(NULL))
goto end;
if (infile && in_stdin) {
BIO_printf(bio_err, "%s: Can't combine -in and -stdin\n", prog);
goto end;

3
apps/pkcs12.c
View file

@ -354,9 +354,6 @@ int pkcs12_main(int argc, char **argv)
mpass = macpass;
}
if (!app_load_modules(NULL))
goto end;
if (export_cert || inrand) {
app_RAND_load_file(NULL, (inrand != NULL));
if (inrand != NULL)

3
apps/pkcs7.c
View file

@ -193,9 +193,6 @@ int pkcs7_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
in = bio_open_default(infile, 'r', informat);
if (in == NULL)
goto end;

3
apps/pkcs8.c
View file

@ -233,9 +233,6 @@ int pkcs8_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
if ((pbe_nid == -1) && !cipher)
pbe_nid = NID_pbeWithMD5AndDES_CBC;

3
apps/pkey.c
View file

@ -169,9 +169,6 @@ int pkey_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
out = bio_open_owner(outfile, outformat, private);
if (out == NULL)
goto end;

3
apps/pkeyparam.c
View file

@ -118,9 +118,6 @@ int pkeyparam_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
in = bio_open_default(infile, 'r', FORMAT_PEM);
if (in == NULL)
goto end;

3
apps/pkeyutl.c
View file

@ -230,9 +230,6 @@ int pkeyutl_main(int argc, char **argv)
if (ctx == NULL)
goto opthelp;
if (!app_load_modules(NULL))
goto end;
if (sigfile && (pkey_op != EVP_PKEY_OP_VERIFY)) {
BIO_printf(bio_err,
"%s: Signature file specified for non verify\n", prog);

3
apps/prime.c
View file

@ -109,9 +109,6 @@ int prime_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (argc == 0 && !generate) {
BIO_printf(bio_err, "%s: No prime specified\n", prog);
goto end;

3
apps/rand.c
View file

@ -126,9 +126,6 @@ int rand_main(int argc, char **argv)
if (sscanf(argv[0], "%d", &num) != 1 || num < 0)
goto opthelp;
if (!app_load_modules(NULL))
goto end;
app_RAND_load_file(NULL, (inrand != NULL));
if (inrand != NULL)
BIO_printf(bio_err, "%ld semi-random bytes loaded\n",

4
apps/rsa.c
View file

@ -256,10 +256,6 @@ int rsa_main(int argc, char **argv)
BIO_printf(bio_err, "Error getting passwords\n");
goto end;
}
if (!app_load_modules(NULL))
goto end;
if (check && pubin) {
BIO_printf(bio_err, "Only private keys can be checked\n");
goto end;

3
apps/rsautl.c
View file

@ -214,9 +214,6 @@ int rsautl_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
/* FIXME: seed PRNG only if needed */
app_RAND_load_file(NULL, 0);

3
apps/s_client.c
View file

@ -1063,9 +1063,6 @@ int s_client_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
if (proxystr) {
if (connectstr == NULL) {
BIO_printf(bio_err, "%s: -proxy requires use of -connect\n", prog);

3
apps/s_server.c
View file

@ -1475,9 +1475,6 @@ int s_server_main(int argc, char *argv[])
goto end;
}
if (!app_load_modules(NULL))
goto end;
if (s_key_file == NULL)
s_key_file = s_cert_file;

3
apps/smime.c
View file

@ -422,9 +422,6 @@ int smime_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
if (need_rand) {
app_RAND_load_file(NULL, (inrand != NULL));
if (inrand != NULL)

3
apps/speed.c
View file

@ -850,9 +850,6 @@ int speed_main(int argc, char **argv)
argc = opt_num_rest();
argv = opt_rest();
if (!app_load_modules(NULL))
goto end;
/* Remaining arguments are algorithms. */
for ( ; *argv; argv++) {
if (found(*argv, doit_choices, &i)) {

2
apps/spkac.c
View file

@ -186,8 +186,6 @@ int spkac_main(int argc, char **argv)
if ((conf = app_load_config(infile)) == NULL)
goto end;
if (!app_load_modules(conf))
goto end;
spkstr = NCONF_get_string(conf, spksect, spkac);

3
apps/verify.c
View file

@ -198,9 +198,6 @@ int verify_main(int argc, char **argv)
goto end;
}
if (!app_load_modules(NULL))
goto end;
if ((store = setup_verify(CAfile, CApath, noCAfile, noCApath)) == NULL)
goto end;
X509_STORE_set_verify_cb(store, cb);

3
apps/x509.c
View file

@ -493,9 +493,6 @@ int x509_main(int argc, char **argv)
if (!nmflag_set)
nmflag = XN_FLAG_ONELINE;
if (!app_load_modules(NULL))
goto end;
out = bio_open_default(outfile, 'w', outformat);
if (out == NULL)
goto end;