diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-12 12:40:15 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-10-12 22:31:00 +0100 |
| commit | a0a82324f965bbcc4faed4e1ee3fcaf81ea52166 (patch) | |
| tree | f7221e7b9d58b659c094aac39a6497c25938588e /apps/pkcs7.c | |
| parent | d175e8a6c23ca212bf57ff78fdbca6942f3e0ef7 (diff) | |
| download | openssl-new-a0a82324f965bbcc4faed4e1ee3fcaf81ea52166.tar.gz | |
Centralise loading default apps config file
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>
Diffstat (limited to 'apps/pkcs7.c')
| -rw-r--r-- | apps/pkcs7.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/apps/pkcs7.c b/apps/pkcs7.c index fff14dc959..1ed0b01339 100644 --- a/apps/pkcs7.c +++ b/apps/pkcs7.c @@ -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; |