[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b4b42ce6213a7c5787460d072dabcd496aebfac8 (commit)
      from  be82f7b32087496d94edaa309a7b2ea9a8c84e1d (commit)


- Log -----------------------------------------------------------------
commit b4b42ce6213a7c5787460d072dabcd496aebfac8
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Wed Aug 10 18:18:33 2016 +0200

    Fix doc and help about ca -valid option
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 apps/ca.c       | 3 ++-
 doc/apps/ca.pod | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/ca.c b/apps/ca.c
index 8059575..331c136 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -194,7 +194,8 @@ OPTIONS ca_options[] = {
     {"spkac", OPT_SPKAC, '<',
      "File contains DN and signed public key and challenge"},
     {"revoke", OPT_REVOKE, '<', "Revoke a cert (given in file)"},
-    {"valid", OPT_VALID, 's'},
+    {"valid", OPT_VALID, 's',
+     "Add a Valid(not-revoked) DB entry about a cert (given in file)"},
     {"extensions", OPT_EXTENSIONS, 's',
      "Extension section (override value in config file)"},
     {"extfile", OPT_EXTFILE, '<',
diff --git a/doc/apps/ca.pod b/doc/apps/ca.pod
index 9bf1239..3be6979 100644
--- a/doc/apps/ca.pod
+++ b/doc/apps/ca.pod
@@ -13,6 +13,7 @@ B<openssl> B<ca>
 [B<-name section>]
 [B<-gencrl>]
 [B<-revoke file>]
+[B<-valid file>]
 [B<-status serial>]
 [B<-updatedb>]
 [B<-crl_reason reason>]
@@ -287,6 +288,10 @@ the number of hours before the next CRL is due.
 
 a filename containing a certificate to revoke.
 
+=item B<-valid filename>
+
+a filename containing a certificate to add a Valid certificate entry.
+
 =item B<-status serial>
 
 displays the revocation status of the certificate with the specified