You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2011/03/14 17:14:26 UTC

svn commit: r1081438 - in /commons/proper/net/trunk/src/main/java/org/apache/commons/net/util: TrustManagerFactory.java TrustManagerUtils.java

Author: sebb
Date: Mon Mar 14 16:14:25 2011
New Revision: 1081438

URL: http://svn.apache.org/viewvc?rev=1081438&view=rev
Log:
Rename class to avoid clashing with javax version
Add method to generate default TrustManager

Added:
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
      - copied, changed from r1081171, commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerFactory.java
Removed:
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerFactory.java

Copied: commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java (from r1081171, commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java?p2=commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java&p1=commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerFactory.java&r1=1081171&r2=1081438&rev=1081438&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerFactory.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java Mon Mar 14 16:14:25 2011
@@ -17,27 +17,30 @@
 
 package org.apache.commons.net.util;
 
+import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
+import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
 /**
- * TrustManager factory for generating custom TrustManagers.
- * 
+ * TrustManager utilities for generating TrustManagers.
+ *
  * @since 3.0
  */
-public final class TrustManagerFactory
+public final class TrustManagerUtils
 {
     private static final X509Certificate[] EMPTY_X509CERTIFICATE_ARRAY = new X509Certificate[]{};
 
     private static class TrustManager implements X509TrustManager {
 
         private final boolean checkServerValidity;
-        
+
         TrustManager(boolean checkServerValidity) {
             this.checkServerValidity = checkServerValidity;
         }
+
         /**
          * Never generates a CertificateException.
          */
@@ -46,7 +49,8 @@ public final class TrustManagerFactory
             return;
         }
 
-        public void checkServerTrusted(X509Certificate[] certificates, String authType) throws CertificateException
+        public void checkServerTrusted(X509Certificate[] certificates, String authType)
+            throws CertificateException
         {
             if (checkServerValidity) {
                 for (int i = 0; i < certificates.length; ++i)
@@ -62,16 +66,16 @@ public final class TrustManagerFactory
         public X509Certificate[] getAcceptedIssuers()
         {
             return EMPTY_X509CERTIFICATE_ARRAY;
-        }        
+        }
     }
 
     private static final X509TrustManager ACCEPT_ALL=new TrustManager(false);
-    
+
     private static final X509TrustManager CHECK_SERVER_VALIDITY=new TrustManager(true);
 
     /**
      * Generate a TrustManager that performs no checks.
-     * 
+     *
      * @return the TrustManager
      */
     public static X509TrustManager getAcceptAllTrustManager(){
@@ -81,11 +85,24 @@ public final class TrustManagerFactory
     /**
      * Generate a TrustManager that checks server certificates for validity,
      * but otherwise performs no checks.
-     * 
+     *
      * @return the validating TrustManager
      */
     public static X509TrustManager getValidateServerCertificateTrustManager(){
-        return CHECK_SERVER_VALIDITY;        
+        return CHECK_SERVER_VALIDITY;
+    }
+
+    /**
+     * Return the default TrustManager provided by the JVM.
+     * <p>
+     * This should be the same as the default used by {@link javax.net.ssl.SSLContext#init(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[], java.security.SecureRandom)
+     * SSLContext#init(KeyManager[], TrustManager[], SecureRandom)}
+     * when the TrustManager parameter is set to {@code null}
+     * @return the default TrustManager
+     * @throws NoSuchAlgorithmException
+     */
+    public static X509TrustManager getDefaultTrustManager() throws NoSuchAlgorithmException {
+        return (X509TrustManager) TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
     }
 
 }