Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] PasswordCreator can generate random salt

This commit is contained in:
Robert von Burg 2017-05-22 14:43:02 +02:00
parent 4c9e66876a
commit 22b326de80
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
li.strolch.privilege/src/main/java/li/strolch/privilege/helper/PasswordCreator.java
View File

@ -102,12 +102,6 @@ public class PasswordCreator {
}
}
System.out.print("Password: ");
char[] password = r.readLine().trim().toCharArray();
System.out.print("Salt: ");
String saltS = StringHelper.getHexString(r.readLine().trim().getBytes());
byte[] salt = StringHelper.fromHexString(saltS);
Map<String, String> parameterMap = new HashMap<>();
parameterMap.put(XmlConstants.XML_PARAM_HASH_ALGORITHM, hashAlgorithm);
parameterMap.put(XmlConstants.XML_PARAM_HASH_ITERATIONS, "" + iterations);
@ -116,6 +110,16 @@ public class PasswordCreator {
DefaultEncryptionHandler encryptionHandler = new DefaultEncryptionHandler();
encryptionHandler.initialize(parameterMap);
System.out.print("Password: ");
char[] password = r.readLine().trim().toCharArray();
System.out.print("Salt [random]: ");
String saltTemp = r.readLine().trim();
if (saltTemp.isEmpty()) {
saltTemp = encryptionHandler.nextToken();
}
String saltS = StringHelper.getHexString(saltTemp.getBytes());
byte[] salt = StringHelper.fromHexString(saltS);
byte[] passwordHash = encryptionHandler.hashPassword(password, salt);
String passwordHashS = StringHelper.getHexString(passwordHash);
System.out.println("Hash is: " + passwordHashS);