diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2017-05-17 15:37:39 +0200 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2017-05-17 15:37:39 +0200 |
| commit | d130456f738cfd7dfb9e192aa6d1848f5faebbf0 (patch) | |
| tree | 71629ba3c48bbc90a570d1e933f3a9c496ad16e5 /apps | |
| parent | 7c300b9d2a9af4d2d28efa0576f1a28af7b2dabf (diff) | |
Fix regression in openssl req -x509 behaviour.
Allow conversion of existing requests to certificates again.
Fixes the issue #3396
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3485)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/req.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/req.c b/apps/req.c index cdea1f6111..ede1d32cae 100644 --- a/apps/req.c +++ b/apps/req.c @@ -331,7 +331,6 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv, "-text") == 0) text = 1; else if (strcmp(*argv, "-x509") == 0) { - newreq = 1; x509 = 1; } else if (strcmp(*argv, "-asn1-kludge") == 0) kludge = 1; @@ -447,6 +446,9 @@ int MAIN(int argc, char **argv) goto end; } + if (x509 && infile == NULL) + newreq = 1; + ERR_load_crypto_strings(); if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { BIO_printf(bio_err, "Error getting passwords\n"); @@ -753,7 +755,7 @@ int MAIN(int argc, char **argv) } } - if (newreq) { + if (newreq || x509) { if (pkey == NULL) { BIO_printf(bio_err, "you need to specify a private key\n"); goto end; |