diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-05-25 19:38:38 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-05-25 19:38:38 +0000 |
commit | 12df5ad9af4981f5d3c31a9819d31618c0f1af51 (patch) | |
tree | 97e3336a3054b8d8a0150b9d414934f73c99cb30 /apps/req.c | |
parent | 5315173646e65b5025be33013edc33eb9658e683 (diff) | |
download | src-test2-12df5ad9af4981f5d3c31a9819d31618c0f1af51.tar.gz src-test2-12df5ad9af4981f5d3c31a9819d31618c0f1af51.zip |
Import OpenSSL 1.0.2l.vendor/openssl/1.0.2l
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=318897
svn path=/vendor-crypto/openssl/1.0.2l/; revision=318898; tag=vendor/openssl/1.0.2l
Diffstat (limited to 'apps/req.c')
-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 cdea1f611194..ede1d32cae62 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; |