diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-04-28 12:51:49 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-04-30 16:04:52 +1000 |
| commit | e9d62da6c305d947530d91e412fdb21a8d8e3510 (patch) | |
| tree | 85779474a2d93c84c351e697aed8627c269c2040 /apps/lib | |
| parent | 9ac653d81a857a5452f9f25278a24e1dfb226905 (diff) | |
Fix CRL app so that stdin works.
Fixes #15031
The maybe_stdin needed to be passed to load_key_certs_crls().
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15058)
Diffstat (limited to 'apps/lib')
| -rw-r--r-- | apps/lib/apps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c index 4b7b38cf5c..1ca6f6e096 100644 --- a/apps/lib/apps.c +++ b/apps/lib/apps.c @@ -499,7 +499,7 @@ X509 *load_cert_pass(const char *uri, int maybe_stdin, return cert; } -X509_CRL *load_crl(const char *uri, const char *desc) +X509_CRL *load_crl(const char *uri, int maybe_stdin, const char *desc) { X509_CRL *crl = NULL; @@ -510,7 +510,7 @@ X509_CRL *load_crl(const char *uri, const char *desc) else if (IS_HTTP(uri)) crl = X509_CRL_load_http(uri, NULL, NULL, 0 /* timeout */); else - (void)load_key_certs_crls(uri, 0, NULL, desc, + (void)load_key_certs_crls(uri, maybe_stdin, NULL, desc, NULL, NULL, NULL, NULL, NULL, &crl, NULL); if (crl == NULL) { BIO_printf(bio_err, "Unable to load %s\n", desc); @@ -2318,8 +2318,8 @@ static X509_CRL *load_crl_crldp(STACK_OF(DIST_POINT) *crldp) for (i = 0; i < sk_DIST_POINT_num(crldp); i++) { DIST_POINT *dp = sk_DIST_POINT_value(crldp, i); urlptr = get_dp_url(dp); - if (urlptr) - return load_crl(urlptr, "CRL via CDP"); + if (urlptr != NULL) + return load_crl(urlptr, 0, "CRL via CDP"); } return NULL; } |