diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2023-05-16 10:17:03 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2023-05-25 09:04:35 +0200 |
| commit | da7f81d39308f9ecab6fde1f9116ff673ef3f3b3 (patch) | |
| tree | 3f1b8310b685dc306c3ff266e552d96829ea1db0 /apps/pkcs12.c | |
| parent | c8aec16383c7a9aec76b28e6eb95d36bef6f7e56 (diff) | |
APPS: replace awkward and error-prone pattern by calls to new app_conf_try_string()
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/20971)
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 4f2d3f7f2e..b8efb536dd 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -683,7 +683,8 @@ int pkcs12_main(int argc, char **argv) if (!app_load_modules(conf)) goto export_end; /* Find the cert bag section */ - if ((cb_attr = NCONF_get_string(conf, "pkcs12", "certBagAttr")) != NULL) { + cb_attr = app_conf_try_string(conf, "pkcs12", "certBagAttr"); + if (cb_attr != NULL) { if ((cb_sk = NCONF_get_section(conf, cb_attr)) != NULL) { for (i = 0; i < sk_CONF_VALUE_num(cb_sk); i++) { val = sk_CONF_VALUE_value(cb_sk, i); @@ -695,8 +696,6 @@ int pkcs12_main(int argc, char **argv) } else { ERR_clear_error(); } - } else { - ERR_clear_error(); } p12 = PKCS12_create_ex2(cpass, name, key, ee_cert, certs, |