Merge pull request #427 from surevine/scram-fixes-2

OF-631 Reduce salt size to fit database

src/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java

@@ -277,7 +277,7 @@ public class DefaultAuthProvider implements AuthProvider {
         }
         
         // Store the salt and salted password so SCRAM-SHA-1 SASL auth can be used later.
-        byte[] saltShaker = new byte[32];
+        byte[] saltShaker = new byte[24];
         random.nextBytes(saltShaker);
         String salt = DatatypeConverter.printBase64Binary(saltShaker);
 

src/java/org/jivesoftware/openfire/sasl/ScramSha1SaslServer.java

@@ -332,7 +332,7 @@ public class ScramSha1SaslServer implements SaslServer {
             return salt;
         } catch (UserNotFoundException | UnsupportedOperationException | ConnectionException | InternalUnauthenticatedException e) {
             Log.warn("Exception in SCRAM.getSalt():", e);
-            byte[] salt = new byte[32];
+            byte[] salt = new byte[24];
             random.nextBytes(salt);
             return salt;
         }