diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-04-22 14:58:41 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-04-24 18:00:24 +0200 |
| commit | 01c12100f7d54db29da3fd47dc40c9d0e08c0ab0 (patch) | |
| tree | 076f471167c5b0929e8aa65c35e26d7e0fb501c5 /apps/req.c | |
| parent | 3ee4e8cea72056ea56fdbfff8bb1b6daf2276933 (diff) | |
Clean up the use of ERR_print_errors() in apps.c and in four apps
Also make sure that all error messages in apps.c consistently begin upper-case.
Changed files: apps/lib/apps.c and apps/{req.c,s_client.c,s_server.c,x509.c}
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/4940)
Diffstat (limited to 'apps/req.c')
| -rw-r--r-- | apps/req.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/req.c b/apps/req.c index 6740f21c35..cba6952cad 100644 --- a/apps/req.c +++ b/apps/req.c @@ -590,12 +590,9 @@ int req_main(int argc, char **argv) if (keyfile != NULL) { pkey = load_key(keyfile, keyform, 0, passin, e, "Private Key"); - if (pkey == NULL) { - /* load_key() has already printed an appropriate message */ + if (pkey == NULL) goto end; - } else { - app_RAND_load_conf(req_conf, section); - } + app_RAND_load_conf(req_conf, section); } if (newreq && (pkey == NULL)) { |