#449 Remove use of legacy settings in encryption methods

src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java

@@ -5,7 +5,8 @@ import fr.xephi.authme.security.crypts.description.HasSalt;
 import fr.xephi.authme.security.crypts.description.Recommendation;
 import fr.xephi.authme.security.crypts.description.SaltType;
 import fr.xephi.authme.security.crypts.description.Usage;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.util.StringUtils;
 
 
@@ -13,6 +14,12 @@ import fr.xephi.authme.util.StringUtils;
 @HasSalt(value = SaltType.TEXT) // length depends on Settings.bCryptLog2Rounds
 public class BCRYPT implements EncryptionMethod {
 
+    private final int bCryptLog2Rounds;
+
+    public BCRYPT(NewSetting settings) {
+        this.bCryptLog2Rounds = settings.getProperty(HooksSettings.BCRYPT_LOG2_ROUND);
+    }
+
     @Override
     public String computeHash(String password, String salt, String name) {
         return BCryptService.hashpw(password, salt);
@@ -36,7 +43,7 @@ public class BCRYPT implements EncryptionMethod {
 
     @Override
     public String generateSalt() {
-        return BCryptService.gensalt(Settings.bCryptLog2Rounds);
+        return BCryptService.gensalt(bCryptLog2Rounds);
     }
 
     @Override

src/main/java/fr/xephi/authme/security/crypts/EncryptionMethod.java

@@ -2,6 +2,10 @@ package fr.xephi.authme.security.crypts;
 
 /**
  * Public interface for custom password encryption methods.
+ * <p>
+ * Note that {@link fr.xephi.authme.security.PasswordSecurity} requires classes implementing this interface
+ * to either have the default constructor or an accessible constructor with one parameter of type
+ * {@link fr.xephi.authme.settings.NewSetting}.
  */
 public interface EncryptionMethod {
 
@@ -31,9 +35,9 @@ public interface EncryptionMethod {
     /**
      * Check whether the given hash matches the clear-text password.
      *
-     * @param password   The clear-text password to verify
+     * @param password       The clear-text password to verify
      * @param hashedPassword The hash to check the password against
-     * @param name       The player name to do the check for (sometimes required for generating the salt)
+     * @param name           The player name to do the check for (sometimes required for generating the salt)
      *
      * @return True if the password matches, false otherwise
      */

src/main/java/fr/xephi/authme/security/crypts/SALTED2MD5.java

@@ -5,7 +5,8 @@ import fr.xephi.authme.security.crypts.description.HasSalt;
 import fr.xephi.authme.security.crypts.description.Recommendation;
 import fr.xephi.authme.security.crypts.description.SaltType;
 import fr.xephi.authme.security.crypts.description.Usage;
-import fr.xephi.authme.settings.Settings;
+import fr.xephi.authme.settings.NewSetting;
+import fr.xephi.authme.settings.properties.SecuritySettings;
 
 import static fr.xephi.authme.security.HashUtils.md5;
 
@@ -13,6 +14,12 @@ import static fr.xephi.authme.security.HashUtils.md5;
 @HasSalt(value = SaltType.TEXT)   // length defined by Settings.saltLength
 public class SALTED2MD5 extends SeparateSaltMethod {
 
+    private final int saltLength;
+
+    public SALTED2MD5(NewSetting settings) {
+        saltLength = settings.getProperty(SecuritySettings.DOUBLE_MD5_SALT_LENGTH);
+    }
+
     @Override
     public String computeHash(String password, String salt, String name) {
         return md5(md5(password) + salt);
@@ -20,7 +27,7 @@ public class SALTED2MD5 extends SeparateSaltMethod {
 
     @Override
     public String generateSalt() {
-        return RandomString.generateHex(Settings.saltLength);
+        return RandomString.generateHex(saltLength);
     }
 
 }