提交 2e66d3d6 编写于 作者: H Hansruedi Patzen 提交者: Richard Levitte

Fix: failed to open config file if not specified when using CA commands

Issue was introduced in
https://github.com/openssl/openssl/commit/a0a82324f965bbcc4faed4e1ee3fcaf81ea52166

This patch fixes an issue which causes the 'openssl ca' commands to
fail if '-config' is not specified even if it says so otherwise.
Problem is that the default config is not loaded and the conf variable
is NULL which causes an exception.
Reviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 e8173157
......@@ -304,11 +304,6 @@ int ca_main(int argc, char **argv)
X509_REVOKED *r = NULL;
OPTION_CHOICE o;
conf = NULL;
section = NULL;
preserve = 0;
msie_hack = 0;
prog = opt_init(argc, argv, ca_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
......@@ -481,13 +476,11 @@ end_of_options:
argv = opt_rest();
BIO_printf(bio_err, "Using configuration from %s\n", configfile);
/* 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;
}
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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册