From e4e2fa7c224b7c5451e537cb71ff618683f70958 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Wed, 24 Jun 2015 16:04:58 +0400
Subject: [PATCH 1/3] =?UTF-8?q?mise=20=C3=A0=20jour=20upassword=20pour=20a?=
 =?UTF-8?q?fficher=20sha=20en=20hexad=C3=A9cimal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upassword | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/upassword b/upassword
index 54105be..e3bbb7e 100755
--- a/upassword
+++ b/upassword
@@ -4795,6 +4795,10 @@ public class upassword {
         return sb.toString();
     }
 
+    private static final String getShaHex(String sha) {
+        return toHex(Base64.decode(sha));
+    }
+
     private void run(String[] args) {
         if (args.length == 1 && strEquals(args[0], "--help")) {
             println("USAGE:" //
@@ -4954,6 +4958,7 @@ public class upassword {
                 printvar("ntlm", ntlm, shell);
                 printvar("crypt", crypt, shell);
                 printvar("sha", sha, shell);
+                printvar("shahex", getShaHex(sha), shell);
                 printvar("ssha", ssha, shell);
                 printvar("md5", md5, shell);
                 printvar("smd5", smd5, shell);

From 34f027b7b705d8827b24a3a296dd6e3bb41f7302 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Wed, 24 Jun 2015 16:19:30 +0400
Subject: [PATCH 2/3] =?UTF-8?q?bug=20avec=20la=20pr=C3=A9sence=20du=20sche?=
 =?UTF-8?q?me=20dans=20sha?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upassword | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upassword b/upassword
index e3bbb7e..44db4f9 100755
--- a/upassword
+++ b/upassword
@@ -4796,7 +4796,7 @@ public class upassword {
     }
 
     private static final String getShaHex(String sha) {
-        return toHex(Base64.decode(sha));
+        return toHex(Base64.decode(sha.substring("{SHA}".length())));
     }
 
     private void run(String[] args) {

From 832810f29fb036b715df1c50e3a2722c99098b25 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Wed, 24 Jun 2015 16:19:51 +0400
Subject: [PATCH 3/3] Init changelog & version 2.2.0

---
 CHANGES.txt | 7 +++++++
 VERSION.txt | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 09ef6b6..b74684b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
 
 40225b0 Intégration de la branche proxy-default
diff --git a/VERSION.txt b/VERSION.txt
index 3e3c2f1..ccbccc3 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.1.1
+2.2.0