[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  1850451676d0f65ef59013750ae942a5d3e7751f (commit)
      from  9496cf577ec4543a6db67092e784c1096a6424fc (commit)


- Log -----------------------------------------------------------------
commit 1850451676d0f65ef59013750ae942a5d3e7751f
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Sep 12 11:29:22 2016 -0400

    Add -h and -help for c_rehash script and app
    
    Resolves GH1515 and GH1509.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 7d959c358a09244bcaea601121b276529ff437ce)

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

Summary of changes:
 apps/rehash.c       | 1 +
 doc/apps/rehash.pod | 3 ++-
 tools/c_rehash.in   | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/rehash.c b/apps/rehash.c
index aacb169..4e10ded 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -403,6 +403,7 @@ OPTIONS rehash_options[] = {
     {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert-directory...]\n"},
     {OPT_HELP_STR, 1, '-', "Valid options are:\n"},
     {"help", OPT_HELP, '-', "Display this summary"},
+    {"h", OPT_HELP, '-', "Display this summary"},
     {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"},
     {"old", OPT_OLD, '-', "Use old-style hash to generate links"},
     {"n", OPT_N, '-', "Do not remove existing links"},
diff --git a/doc/apps/rehash.pod b/doc/apps/rehash.pod
index 62e39cf..936fda6 100644
--- a/doc/apps/rehash.pod
+++ b/doc/apps/rehash.pod
@@ -11,6 +11,7 @@ c_rehash, rehash - Create symbolic links to files named by the hash values
 
 B<openssl>
 B<rehash>
+B<[-h]>
 B<[-help]>
 B<[-old]>
 B<[-n]>
@@ -82,7 +83,7 @@ optionally prefixed with some text and an equals sign.
 
 =over 4
 
-=item B<-help>
+=item B<-help> B<-h>
 
 Display a brief usage message.
 
diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 2fef627..e658222 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -30,7 +30,7 @@ while ( $ARGV[0] =~ /^-/ ) {
     if ( $flag eq '-old') {
 	    $x509hash = "-subject_hash_old";
 	    $crlhash = "-hash_old";
-    } elsif ( $flag eq '-h') {
+    } elsif ( $flag eq '-h' || $flag eq '-help' ) {
 	    help();
     } elsif ( $flag eq '-n' ) {
 	    $removelinks = 0;
@@ -38,15 +38,15 @@ while ( $ARGV[0] =~ /^-/ ) {
 	    $verbose++;
     }
     else {
-	    print STDERR "Usage error; try -help.\n";
+	    print STDERR "Usage error; try -h.\n";
 	    exit 1;
     }
 }
 
 sub help {
-	print "Usage: c_rehash [-old] [-h] [-v] [dirs...]\n";
+	print "Usage: c_rehash [-old] [-h] [-help] [-v] [dirs...]\n";
 	print "   -old use old-style digest\n";
-	print "   -h print this help text\n";
+	print "   -h or -help print this help text\n";
 	print "   -v print files removed and linked\n";
 	exit 0;
 }