Author: rwinston
Date: Sat Nov 25 04:57:17 2006
New Revision: 479122
URL: http://svn.apache.org/viewvc?view=rev&rev=479122
Log:
Make the KeyManager settable
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?view=diff&rev=479122&r1=479121&r2=479122
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Sat Nov 25 04:57:17 2006
@@ -23,6 +23,7 @@
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
+import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLServerSocketFactory;
@@ -79,6 +80,9 @@
/** The FTPS [EMAIL PROTECTED] TrustManager} implementation. */
private TrustManager trustManager = new FTPSTrustManager();
+
+ /** The [EMAIL PROTECTED] KeyManager} */
+ private KeyManager keyManager;
/**
* Constructor for FTPSClient.
@@ -194,7 +198,7 @@
planeSocket = _socket_;
try {
- context.init(null, new TrustManager[] {
getTrustManager() } , null);
+ context.init(new KeyManager[] { getKeyManager() } , new
TrustManager[] { getTrustManager() } , null);
} catch (KeyManagementException e) {
e.printStackTrace();
}
@@ -222,8 +226,25 @@
_controlOutput_ = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream(), getControlEncoding()));
}
-
+
+ /**
+ * Get the [EMAIL PROTECTED] KeyManager} instance.
+ * @return The [EMAIL PROTECTED] KeyManager} instance
+ */
+ private KeyManager getKeyManager() {
+ return keyManager;
+ }
+
/**
+ * Set a [EMAIL PROTECTED] KeyManager} to use
+ *
+ * @param keyManager The KeyManager implementation to set.
+ */
+ public void setKeyManager(KeyManager keyManager) {
+ this.keyManager = keyManager;
+ }
+
+ /**
* Controls whether new a SSL session may be established by this socket.
* @param isCreation The established socket flag.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
