--- jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java.orig	2004-06-17 21:11:40.000000000 -0400
+++ jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java	2004-12-07 15:21:53.000000000 -0500
@@ -66,8 +66,8 @@
      */
      void init() throws IOException {
         try {
-            Security.addProvider (new sun.security.provider.Sun());
-            Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
+            // Security.addProvider (new sun.security.provider.Sun());
+            // Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
 
             String clientAuthStr = (String)attributes.get("clientauth");
             if("true".equalsIgnoreCase(clientAuthStr) || 
@@ -85,8 +85,8 @@
             if (algorithm == null) algorithm = defaultAlgorithm;
 
             // Set up KeyManager, which will extract server key
-            com.sun.net.ssl.KeyManagerFactory kmf = 
-                com.sun.net.ssl.KeyManagerFactory.getInstance(algorithm);
+            javax.net.ssl.KeyManagerFactory kmf = 
+                javax.net.ssl.KeyManagerFactory.getInstance(algorithm);
             String keystoreType = (String)attributes.get("keystoreType");
             if (keystoreType == null) {
                 keystoreType = defaultKeystoreType;
@@ -96,22 +96,22 @@
                      keystorePass.toCharArray());
 
             // Set up TrustManager
-            com.sun.net.ssl.TrustManager[] tm = null;
+            javax.net.ssl.TrustManager[] tm = null;
             String truststoreType = (String)attributes.get("truststoreType");
             if(truststoreType == null) {
                 truststoreType = keystoreType;
             }
             KeyStore trustStore = getTrustStore(truststoreType);
             if (trustStore != null) {
-                com.sun.net.ssl.TrustManagerFactory tmf =
-                    com.sun.net.ssl.TrustManagerFactory.getInstance("SunX509");
+                javax.net.ssl.TrustManagerFactory tmf =
+                    javax.net.ssl.TrustManagerFactory.getInstance("SunX509");
                 tmf.init(trustStore);
                 tm = tmf.getTrustManagers();
             }
 
             // Create and init SSLContext
-            com.sun.net.ssl.SSLContext context = 
-                com.sun.net.ssl.SSLContext.getInstance(protocol); 
+            javax.net.ssl.SSLContext context = 
+                javax.net.ssl.SSLContext.getInstance(protocol); 
             context.init(kmf.getKeyManagers(), tm, new SecureRandom());
 
             // Create proxy