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 2009/02/22 22:30:44 UTC
svn commit: r746824 - in
/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl:
SSLTestTemplate.java impl/AliasKeymanagerTest.java
impl/ExtendedAliasKeymanagerTest.java
Author: ngn
Date: Sun Feb 22 21:30:42 2009
New Revision: 746824
URL: http://svn.apache.org/viewvc?rev=746824&view=rev
Log:
Making sure our SSL tests work on IBM JDK
Modified:
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
Modified: mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java?rev=746824&r1=746823&r2=746824&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java Sun Feb 22 21:30:42 2009
@@ -104,12 +104,12 @@
// initialize key manager factory
KeyManagerFactory keyManagerFactory = KeyManagerFactory
- .getInstance("SunX509");
+ .getInstance(KeyManagerFactory.getDefaultAlgorithm());
keyManagerFactory.init(store, KEYSTORE_PASSWORD.toCharArray());
// initialize trust manager factory
TrustManagerFactory trustManagerFactory = TrustManagerFactory
- .getInstance("SunX509");
+ .getInstance(TrustManagerFactory.getDefaultAlgorithm());
trustManagerFactory.init(store);
@@ -122,6 +122,10 @@
String auth = getAuthValue();
if (auth != null) {
ftpsClient.setAuthValue(auth);
+
+ if(auth.equals("SSL")) {
+ ftpsClient.setEnabledProtocols(new String[]{"SSLv3"});
+ }
}
return ftpsClient;
}
Modified: mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java?rev=746824&r1=746823&r2=746824&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/AliasKeymanagerTest.java Sun Feb 22 21:30:42 2009
@@ -44,7 +44,7 @@
"src/test/resources/keymanager-test.jks");
ks.load(fis, "".toCharArray());
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, "".toCharArray());
km = kmf.getKeyManagers()[0];
Modified: mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java?rev=746824&r1=746823&r2=746824&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/test/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeymanagerTest.java Sun Feb 22 21:30:42 2009
@@ -44,7 +44,7 @@
"src/test/resources/keymanager-test.jks");
ks.load(fis, "".toCharArray());
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, "".toCharArray());
km = kmf.getKeyManagers()[0];