support de crypt salt avec salt en hexadécimal
This commit is contained in:
parent
0e9fd3bdf6
commit
4ff7ce3387
|
@ -4658,7 +4658,12 @@ public class upassword {
|
||||||
println("salt: " + toHex(binarySalt));
|
println("salt: " + toHex(binarySalt));
|
||||||
println("ssha: " + ssha);
|
println("ssha: " + ssha);
|
||||||
println("smd5: " + smd5);
|
println("smd5: " + smd5);
|
||||||
|
if (salt.length() >= 2) {
|
||||||
|
String cryptSalt = Salt.getCryptSalt(salt);
|
||||||
|
String crypt = getPasswordCryptSalt(clear, Password.CRYPT, cryptSalt).getNormalized();
|
||||||
|
if (!salt.equals(cryptSalt)) println("salt: " + cryptSalt);
|
||||||
|
println("crypt: " + crypt);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
String cryptSalt = Salt.getCryptSalt(salt);
|
String cryptSalt = Salt.getCryptSalt(salt);
|
||||||
String crypt = getPasswordCryptSalt(clear, Password.CRYPT, cryptSalt).getNormalized();
|
String crypt = getPasswordCryptSalt(clear, Password.CRYPT, cryptSalt).getNormalized();
|
||||||
|
|
Loading…
Reference in New Issue