reupload files

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

@@ -0,0 +1,40 @@
+package fr.xephi.authme.security.crypts;
+
+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.util.RandomStringUtils;
+
+/**
+ * Common type for encryption methods which use a random String of hexadecimal characters
+ * and store the salt with the hash itself.
+ */
+@Recommendation(Usage.ACCEPTABLE)
+@HasSalt(SaltType.TEXT) // See getSaltLength() for length
+public abstract class HexSaltedMethod implements EncryptionMethod {
+
+    public abstract int getSaltLength();
+
+    @Override
+    public abstract String computeHash(String password, String salt, String name);
+
+    @Override
+    public HashedPassword computeHash(String password, String name) {
+        String salt = generateSalt();
+        return new HashedPassword(computeHash(password, salt, null));
+    }
+
+    @Override
+    public abstract boolean comparePassword(String password, HashedPassword hashedPassword, String name);
+
+    @Override
+    public String generateSalt() {
+        return RandomStringUtils.generateHex(getSaltLength());
+    }
+
+    @Override
+    public boolean hasSeparateSalt() {
+        return false;
+    }
+}