shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [1/2] shiro git commit: Fix Hasher's help output.
Date Wed, 02 May 2018 15:19:19 GMT
Repository: shiro
Updated Branches:
  refs/heads/master 76416edfb -> 738edaede


Fix Hasher's help output.

The options for controlling the generated public salt were all
incorrectly documented.


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/bad53217
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/bad53217
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/bad53217

Branch: refs/heads/master
Commit: bad532171452aba5abfe7146bda9cacb07cb65d2
Parents: f326fd3
Author: Ewan Mellor <commits@ewanmellor.org>
Authored: Thu Mar 15 16:09:59 2018 -0700
Committer: Ewan Mellor <commits@ewanmellor.org>
Committed: Thu Mar 15 16:11:37 2018 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/shiro/tools/hasher/Hasher.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/bad53217/tools/hasher/src/main/java/org/apache/shiro/tools/hasher/Hasher.java
----------------------------------------------------------------------
diff --git a/tools/hasher/src/main/java/org/apache/shiro/tools/hasher/Hasher.java b/tools/hasher/src/main/java/org/apache/shiro/tools/hasher/Hasher.java
index d9fca9d..435e2f9 100644
--- a/tools/hasher/src/main/java/org/apache/shiro/tools/hasher/Hasher.java
+++ b/tools/hasher/src/main/java/org/apache/shiro/tools/hasher/Hasher.java
@@ -382,16 +382,15 @@ public final class Hasher {
                 "\n\n" +
                 "Generating a salt:" +
                 "\n\n" +
-                "Use the -sg/--saltgenerated option if you don't want to specify a salt,\n"
+
+                "Use the -gs/--gensalt option if you don't want to specify a salt,\n" +
                 "but want a strong random salt to be generated and used during hashing.\n"
+
                 "The generated salt size defaults to 128 bits.  You may specify\n" +
-                "a different size by using the -sgs/--saltgeneratedsize option followed by\n"
+
+                "a different size by using the -gss/--gensaltsize option followed by\n" +
                 "a positive integer (size is in bits, not bytes)." +
                 "\n\n" +
-                "Because a salt must be specified if computing the\n" +
-                "hash later, generated salts will be printed, defaulting to base64\n" +
-                "encoding.  If you prefer to use hex encoding, additionally use the\n" +
-                "-sgh/--saltgeneratedhex option." +
+                "Because a salt must be specified if computing the hash later,\n" +
+                "generated salts are only useful with the shiro1 output format;\n" +
+                "the other formats do not include the generated salt." +
                 "\n\n" +
                 "Specifying a private salt:" +
                 "\n\n" +


Mime
View raw message