From d6415542d3848d4cdbaf2ccf7ab91f9c5d566df5 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Tue, 15 Sep 2009 01:30:16 +0000
Subject: [PATCH] 289027 deobfuscate HttpClient SSL passwords

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@894 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                   |  1 +
 .../org/eclipse/jetty/client/HttpClient.java  | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index c594781ffc9..05a08d6815b 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -3,6 +3,7 @@ jetty-7.0.1-SNAPSHOT
  + Promoted Jetty Centralized Logging from Sandbox
  + 288401 HttpExchange.cancel() Method Unimplemented
  + 289265 Test harness for async input
+ + 289027 deobfuscate HttpClient SSL passwords
 
 jetty-7.0.0.RC6-SNAPSHOT
  + 288055 jetty-client fails to resolve failed resolution attempts correctly
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
index 075dfe0f13d..ad7358a8acf 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -38,6 +38,7 @@ import org.eclipse.jetty.client.security.Authorization;
 import org.eclipse.jetty.client.security.RealmResolver;
 import org.eclipse.jetty.http.HttpBuffers;
 import org.eclipse.jetty.http.HttpSchemes;
+import org.eclipse.jetty.http.security.Password;
 import org.eclipse.jetty.io.Buffer;
 import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.io.nio.DirectNIOBuffer;
@@ -709,38 +710,45 @@ public class HttpClient extends HttpBuffers implements Attributes
         _maxRetries = retries;
     }
 
+    /* ------------------------------------------------------------ */
     public String getTrustStoreLocation()
     {
         return _trustStoreLocation;
     }
 
+    /* ------------------------------------------------------------ */
     public void setTrustStoreLocation(String trustStoreLocation)
     {
         this._trustStoreLocation = trustStoreLocation;
     }
 
+    /* ------------------------------------------------------------ */
     public String getKeyStoreLocation()
     {
         return _keyStoreLocation;
     }
 
+    /* ------------------------------------------------------------ */
     public void setKeyStoreLocation(String keyStoreLocation)
     {
         this._keyStoreLocation = keyStoreLocation;
     }
 
-    public void setKeyStorePassword(String _keyStorePassword)
+    /* ------------------------------------------------------------ */
+    public void setKeyStorePassword(String keyStorePassword)
     {
-        this._keyStorePassword = _keyStorePassword;
+        this._keyStorePassword = new Password(keyStorePassword).toString();
     }
 
-    public void setKeyManagerPassword(String _keyManagerPassword)
+    /* ------------------------------------------------------------ */
+    public void setKeyManagerPassword(String keyManagerPassword)
     {
-        this._keyManagerPassword = _keyManagerPassword;
+        this._keyManagerPassword = new Password(keyManagerPassword).toString();;
     }
 
-    public void setTrustStorePassword(String _trustStorePassword)
+    /* ------------------------------------------------------------ */
+    public void setTrustStorePassword(String trustStorePassword)
     {
-        this._trustStorePassword = _trustStorePassword;
+        this._trustStorePassword = new Password(trustStorePassword).toString();;
     }
 }