You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/06/25 10:59:14 UTC
svn commit: r671470 -
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
Author: ngn
Date: Wed Jun 25 01:59:14 2008
New Revision: 671470
URL: http://svn.apache.org/viewvc?rev=671470&view=rev
Log:
Fall back to key store password if key password not provided
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java?rev=671470&r1=671469&r2=671470&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java Wed Jun 25 01:59:14 2008
@@ -283,9 +283,16 @@
trustStore = keyStore;
}
+
+ String keyPassToUse;
+ if(keyPass == null) {
+ keyPassToUse = keystorePass;
+ } else {
+ keyPassToUse = keyPass;
+ }
// initialize key manager factory
keyManagerFactory = KeyManagerFactory.getInstance(keystoreAlgorithm);
- keyManagerFactory.init(keyStore, keyPass.toCharArray());
+ keyManagerFactory.init(keyStore, keyPassToUse.toCharArray());
// initialize trust manager factory
trustManagerFactory = TrustManagerFactory.getInstance(trustStoreAlgorithm);