#685 Add php implementation for PBKDF2

- Create php sample for PBKDF2 - Rename pbkdf2 java classes (remove Crypt prefix) - Remove options from hash setting comment that should not be used
2016-11-25 16:41:55 +01:00
parent de5324bbc6
commit 122c6586bc
9 changed files with 75 additions and 21 deletions
@@ -0,0 +1,51 @@
+package fr.xephi.authme.security.crypts;
+
+import de.rtner.security.auth.spi.PBKDF2Engine;
+import de.rtner.security.auth.spi.PBKDF2Parameters;
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.security.crypts.description.AsciiRestricted;
+import fr.xephi.authme.util.StringUtils;
+
+import javax.xml.bind.DatatypeConverter;
+
+@AsciiRestricted
+public class Pbkdf2Django extends HexSaltedMethod {
+
+    private static final int DEFAULT_ITERATIONS = 24000;
+
+    @Override
+    public String computeHash(String password, String salt, String name) {
+        String result = "pbkdf2_sha256$" + DEFAULT_ITERATIONS + "$" + salt + "$";
+        PBKDF2Parameters params = new PBKDF2Parameters("HmacSHA256", "ASCII", salt.getBytes(), DEFAULT_ITERATIONS);
+        PBKDF2Engine engine = new PBKDF2Engine(params);
+
+        return result + DatatypeConverter.printBase64Binary(engine.deriveKey(password, 32));
+    }
+
+    @Override
+    public boolean comparePassword(String password, HashedPassword hashedPassword, String unusedName) {
+        String[] line = hashedPassword.getHash().split("\\$");
+        if (line.length != 4) {
+            return false;
+        }
+        int iterations;
+        try {
+            iterations = Integer.parseInt(line[1]);
+        } catch (NumberFormatException e) {
+            ConsoleLogger.warning("Could not read number of rounds for Pbkdf2Django:"
+                + StringUtils.formatException(e));
+            return false;
+        }
+        String salt = line[2];
+        byte[] derivedKey = DatatypeConverter.parseBase64Binary(line[3]);
+        PBKDF2Parameters params = new PBKDF2Parameters("HmacSHA256", "ASCII", salt.getBytes(), iterations, derivedKey);
+        PBKDF2Engine engine = new PBKDF2Engine(params);
+        return engine.verifyKey(password);
+    }
+
+    @Override
+    public int getSaltLength() {
+        return 12;
+    }
+
+}