[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  89a99cd589d69d3861afa8865986e2d98afb979a (commit)
      from  1c47d35a0380783b62004a7cb8058d34e082f8d5 (commit)


- Log -----------------------------------------------------------------
commit 89a99cd589d69d3861afa8865986e2d98afb979a
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Nov 7 07:04:21 2017 -0500

    Warn if -days without -x509
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4692)

-----------------------------------------------------------------------

Summary of changes:
 apps/req.c       | 2 ++
 doc/man1/req.pod | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/req.c b/apps/req.c
index dab67a0..79425e5 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -333,6 +333,8 @@ int req_main(int argc, char **argv)
     if (argc != 0)
         goto opthelp;
 
+    if (days && !x509)
+        BIO_printf(bio_err, "Ignoring -days; not generating a certificate");
     if (x509 && infile == NULL)
         newreq = 1;
 
diff --git a/doc/man1/req.pod b/doc/man1/req.pod
index 7a49098..d0d471f 100644
--- a/doc/man1/req.pod
+++ b/doc/man1/req.pod
@@ -247,7 +247,8 @@ to the self signed certificate otherwise new request is created.
 =item B<-days n>
 
 When the B<-x509> option is being used this specifies the number of
-days to certify the certificate for. The default is 30 days.
+days to certify the certificate for, otherwise it is ignored.
+The default is 30 days.
 
 =item B<-set_serial n>