diff options
| author | David von Oheimb <David.von.Oheimb@siemens.com> | 2017-12-15 20:50:37 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-04-24 18:00:24 +0200 |
| commit | 9d5aca655323d795ad8c28fa6be47250a08c18c7 (patch) | |
| tree | df73c17256c994c1f43ea708f18fc172cd17e7f9 /apps/s_client.c | |
| parent | 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 (diff) | |
Add function load_csr(file,format,desc) to apps/lib/apps.c
Make use of new load_csr() in 'ca', 'req', and 'x509' app
Add '-inform' and '-certform' option to 'ca' app
Add 'desc' parameter to load_crl() function defined in apps/lib/apps.c
Allow 'desc' parameter to be NULL (gives option to suppress error output)
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/s_client.c')
| -rw-r--r-- | apps/s_client.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index a28b2867a3..1596cb2f1e 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1736,12 +1736,9 @@ int s_client_main(int argc, char **argv) if (crl_file != NULL) { X509_CRL *crl; - crl = load_crl(crl_file, crl_format); - if (crl == NULL) { - BIO_puts(bio_err, "Error loading CRL\n"); - ERR_print_errors(bio_err); + crl = load_crl(crl_file, crl_format, "CRL"); + if (crl == NULL) goto end; - } crls = sk_X509_CRL_new_null(); if (crls == NULL || !sk_X509_CRL_push(crls, crl)) { BIO_puts(bio_err, "Error adding CRL\n"); |