commit b0d431b61da9758ff34d8a5ef1d1c801e55b4cd9
author Jeffery Painter <painter@apache.org> Mon Oct 08 15:57:04 2018 +0000
committer Jeffery Painter <painter@apache.org> Mon Oct 08 15:57:04 2018 +0000
tree ab2f66db1b33fa67ee493ea3ee7526b14a95c652
parent 69db14391ef6aa8f4f8756b9d5e8fd7ce4acde63

Wrapping up a few more findbug complaints

git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/crypto@1843165 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java

diff --git a/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java b/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
index 3bc115d..28f6291 100644
--- a/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
+++ b/src/java/org/apache/fulcrum/crypto/impl/UnixCrypt.java
@@ -280,7 +280,7 @@
     {
         Random randomGenerator = new Random();
         int numSaltChars = saltChars.length;
-        String salt = "" + saltChars[Math.abs(randomGenerator.nextInt()) % numSaltChars] + saltChars[Math.abs(randomGenerator.nextInt()) % numSaltChars];
+        String salt = "" + saltChars[Math.abs(randomGenerator.nextInt() % numSaltChars)] + saltChars[Math.abs(randomGenerator.nextInt() % numSaltChars)];
         return crypt(salt, original);
     }
 

src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java

diff --git a/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java b/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
index 740ef57..b28dd64 100644
--- a/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
+++ b/src/java/org/apache/fulcrum/crypto/provider/UnixCrypt.java
@@ -96,10 +96,10 @@
             int numSaltChars = SALT_CHARS.length;
 
             seed = (new StringBuilder())
-                .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
-                                   % numSaltChars])
-                .append(SALT_CHARS[Math.abs(randomGenerator.nextInt())
-                                   % numSaltChars])
+                .append(SALT_CHARS[Math.abs(randomGenerator.nextInt()
+                                   % numSaltChars)])
+                .append(SALT_CHARS[Math.abs(randomGenerator.nextInt()
+                                   % numSaltChars)])
                 .toString();
         }