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/04 23:09:00 UTC

svn commit: r740915 - /mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/ssl/SslConfigurationFactory.java

Author: ngn
Date: Wed Feb  4 22:09:00 2009
New Revision: 740915

URL: http://svn.apache.org/viewvc?rev=740915&view=rev
Log:
Using the JVM default keystore and truststore algorithm, rather than the hard coded Sun version (FTPSERVER-273)

Modified:
    mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/ssl/SslConfigurationFactory.java

Modified: mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/ssl/SslConfigurationFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/ssl/SslConfigurationFactory.java?rev=740915&r1=740914&r2=740915&view=diff
==============================================================================
--- mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/ssl/SslConfigurationFactory.java (original)
+++ mina/ftpserver/branches/1.0.x/core/src/main/java/org/apache/ftpserver/ssl/SslConfigurationFactory.java Wed Feb  4 22:09:00 2009
@@ -53,7 +53,7 @@
 
     private String keystoreType = KeyStore.getDefaultType();
 
-    private String keystoreAlgorithm = "SunX509";
+    private String keystoreAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
 
     private File trustStoreFile;
 
@@ -61,7 +61,7 @@
 
     private String trustStoreType = KeyStore.getDefaultType();
 
-    private String trustStoreAlgorithm = "SunX509";
+    private String trustStoreAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
 
     private String sslProtocol = "TLS";