modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Intégration de la branche release-2.2.0

This commit is contained in:
Jephté Clain 2015-06-24 16:19:51 +04:00
parent 02742deccc 832810f29f
commit 53ce593a4f
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.txt
View File

@ -1,3 +1,10 @@
## Version 2.2.0 du 24/06/2015-16:19
98cfdfc Intégration de la branche update-upassword
34f027b bug avec la présence du scheme dans sha
b5e6c13 Intégration de la branche update-upassword
e4e2fa7 mise à jour upassword pour afficher sha en hexadécimal
## Version 2.1.1 du 22/06/2015-11:37 ## Version 2.1.1 du 22/06/2015-11:37
40225b0 Intégration de la branche proxy-default 40225b0 Intégration de la branche proxy-default

2
VERSION.txt
View File

@ -1 +1 @@
2.1.1 2.2.0

5
upassword
View File

@ -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.substring("{SHA}".length())));
}
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);