31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
|
diff -up openssl-1.0.2k/apps/req.c.req-x509 openssl-1.0.2k/apps/req.c
|
||
|
|
--- openssl-1.0.2k/apps/req.c.req-x509 2017-03-09 17:59:26.269231647 +0100
|
||
|
|
+++ openssl-1.0.2k/apps/req.c 2017-05-17 13:23:31.236556216 +0200
|
||
|
|
@@ -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;
|