apps/req.c: Make sure -verify option takes effect also with -x509

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13658)

diff --git a/apps/req.c b/apps/req.c
index 3aef8882a834645173e0a56fe8860fed5770fb32..8c66f2a5fbef346cf0ff856832147d0ba7f99078 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -104,7 +104,7 @@ const OPTIONS req_options[] = {
 #endif
     {"in", OPT_IN, '<', "X.509 request input file"},
     {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
-    {"verify", OPT_VERIFY, '-', "Verify signature on REQ"},
+    {"verify", OPT_VERIFY, '-', "Verify self-signature on the request"},
 
     OPT_SECTION("Certificate"),
     {"new", OPT_NEW, '-', "New request"},
@@ -932,7 +932,7 @@ int req_main(int argc, char **argv)
         }
     }
 
-    if (verify && !gen_x509) {
+    if (verify) {
         EVP_PKEY *tpubkey = pkey;
 
         if (tpubkey == NULL) {

diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in
index ac83f3569221241cc58c4a13e140c94d8143cb23..72f9997aea5c43951c5ec305459b729c5cc53310 100644 (file)
--- a/doc/man1/openssl-req.pod.in
+++ b/doc/man1/openssl-req.pod.in
@@ -142,7 +142,7 @@ Prints out the value of the modulus of the public key contained in the request.
 
 =item B<-verify>
 
-Verifies the signature on the request.
+Verifies the self-signature on the request.
 
 =item B<-new>