Intégration de la branche update-upassword
This commit is contained in:
commit
b5e6c13c30
|
@ -4795,6 +4795,10 @@ public class upassword {
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final String getShaHex(String sha) {
|
||||||
|
return toHex(Base64.decode(sha));
|
||||||
|
}
|
||||||
|
|
||||||
private void run(String[] args) {
|
private void run(String[] args) {
|
||||||
if (args.length == 1 && strEquals(args[0], "--help")) {
|
if (args.length == 1 && strEquals(args[0], "--help")) {
|
||||||
println("USAGE:" //
|
println("USAGE:" //
|
||||||
|
@ -4954,6 +4958,7 @@ public class upassword {
|
||||||
printvar("ntlm", ntlm, shell);
|
printvar("ntlm", ntlm, shell);
|
||||||
printvar("crypt", crypt, shell);
|
printvar("crypt", crypt, shell);
|
||||||
printvar("sha", sha, shell);
|
printvar("sha", sha, shell);
|
||||||
|
printvar("shahex", getShaHex(sha), shell);
|
||||||
printvar("ssha", ssha, shell);
|
printvar("ssha", ssha, shell);
|
||||||
printvar("md5", md5, shell);
|
printvar("md5", md5, shell);
|
||||||
printvar("smd5", smd5, shell);
|
printvar("smd5", smd5, shell);
|
||||||
|
|
Loading…
Reference in New Issue