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/crl.c | |
| parent | 852c2ed260860b6b85c84f9fe96fb4d23d49c9f2 (diff) | |
| download | openssl-9d5aca655323d795ad8c28fa6be47250a08c18c7.tar.gz | |
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/crl.c')
| -rw-r--r-- | apps/crl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/crl.c b/apps/crl.c index 8b5a36322a..8028fef5de 100644 --- a/apps/crl.c +++ b/apps/crl.c @@ -205,7 +205,7 @@ int crl_main(int argc, char **argv) if (argc != 0) goto opthelp; - x = load_crl(infile, informat); + x = load_crl(infile, informat, "CRL"); if (x == NULL) goto end; @@ -250,7 +250,7 @@ int crl_main(int argc, char **argv) BIO_puts(bio_err, "Missing CRL signing key\n"); goto end; } - newcrl = load_crl(crldiff, informat); + newcrl = load_crl(crldiff, informat, "other CRL"); if (!newcrl) goto end; pkey = load_key(keyfile, keyformat, 0, NULL, NULL, "CRL signing key"); |