diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-05 21:05:35 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-03-15 13:29:57 +0100 |
| commit | ea51096e51571b0dfe1e9e63661ad6f62ce0d82a (patch) | |
| tree | 58e1c359aaa08b76d7abf971e6c97d009da0e1b7 /apps/pkcs12.c | |
| parent | 8287a4c3b2230f8df109f5eb34171fa0058add2c (diff) | |
apps: Add maybe_stdin argument to load_certs and set it in pkcs12
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14449)
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index c5f2981aa7..0a88140880 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -525,7 +525,7 @@ int pkcs12_main(int argc, char **argv) /* Load all certs in input file */ if (!(options & NOCERTS)) { - if (!load_certs(infile, &certs, passin, + if (!load_certs(infile, 1, &certs, passin, "certificates from -in file")) goto export_end; if (sk_X509_num(certs) < 1) { @@ -560,7 +560,7 @@ int pkcs12_main(int argc, char **argv) /* Load any untrusted certificates for chain building */ if (untrusted != NULL) { - if (!load_certs(untrusted, &untrusted_certs, passcerts, + if (!load_certs(untrusted, 0, &untrusted_certs, passcerts, "untrusted certificates")) goto export_end; } @@ -605,7 +605,7 @@ int pkcs12_main(int argc, char **argv) /* Add any extra certificates asked for */ if (certfile != NULL) { - if (!load_certs(certfile, &certs, passcerts, + if (!load_certs(certfile, 0, &certs, passcerts, "extra certificates from -certfile")) goto export_end; } |