Merge pull request apache#2324 from ntolppi/feature-iterations-parameter

Added support for iterations parameter

Author: fpapon

crypto/hash/src/main/java/org/apache/shiro/crypto/hash/SimpleHashProvider.java

@@ -200,7 +200,7 @@ protected ByteSource combine(ByteSource privateSalt, ByteSource publicSalt) {
         }
     }
 
-    static final class Parameters {
+    public static final class Parameters {
         public static final String PARAMETER_ITERATIONS = "SimpleHash.iterations";
 
         /**

tools/hasher/src/main/java/org/apache/shiro/tools/hasher/Hasher.java

@@ -30,6 +30,7 @@
 import org.apache.shiro.crypto.hash.DefaultHashService;
 import org.apache.shiro.crypto.hash.Hash;
 import org.apache.shiro.crypto.hash.HashRequest;
+import org.apache.shiro.crypto.hash.SimpleHashProvider;
 import org.apache.shiro.crypto.hash.SimpleHashRequest;
 import org.apache.shiro.crypto.hash.format.DefaultHashFormatFactory;
 import org.apache.shiro.crypto.hash.format.HashFormat;
@@ -49,9 +50,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.Arrays;
 
-import static java.util.Collections.emptyMap;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Commandline line utility to hash data such as strings, passwords, resources (files, urls, etc.).
@@ -244,18 +246,22 @@ public static void main(String[] args) {
                 }
             }
 
+            Map<String, Object> parameters = new ConcurrentHashMap<>();
+
             if (iterations < DEFAULT_NUM_ITERATIONS) {
                 //Iterations were not specified.  Default to 350,000 when password hashing, and 1 for everything else:
                 if (password) {
                     iterations = DEFAULT_PASSWORD_NUM_ITERATIONS;
                 } else {
                     iterations = DEFAULT_NUM_ITERATIONS;
                 }
+            } else {
+                //Iterations were specified, so add the iterations parameter:
+                parameters.put(SimpleHashProvider.Parameters.PARAMETER_ITERATIONS, iterations);
             }
 
             ByteSource publicSalt = getSalt(saltString, saltBytesString, generateSalt, generatedSaltSize);
-            // FIXME: add options here.
-            HashRequest hashRequest = new SimpleHashRequest(algorithm, ByteSource.Util.bytes(source), publicSalt, emptyMap());
+            HashRequest hashRequest = new SimpleHashRequest(algorithm, ByteSource.Util.bytes(source), publicSalt, parameters);
 
             DefaultHashService hashService = new DefaultHashService();
             Hash hash = hashService.computeHash(hashRequest);