Blob Blame History Raw
--- ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java.sav	2005-08-24 15:49:40.000000000 -0400
+++ ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java	2007-03-08 17:43:27.000000000 -0500
@@ -26,7 +26,7 @@
      * default with setSecurityProviderClass().
      */
     public final static String DEFAULT_SECURITY_PROVIDER_CLASS = 
-        "com.sun.net.ssl.internal.ssl.Provider";
+        "gnu.javax.net.ssl.provider.Jessie";
 
     public final static String SECURITY_PROVIDER_CLASS =
         "security.provider";
@@ -97,7 +97,7 @@
      * Default key manager type. You probably don't need to
      * override this default.
      */
-    public final static String DEFAULT_KEY_MANAGER_TYPE = "SunX509";
+    public final static String DEFAULT_KEY_MANAGER_TYPE = "JessieX509";
 
     public final static String KEY_MANAGER_TYPE = 
         "sun.ssl.keymanager.type";
@@ -110,7 +110,7 @@
      * are using something other than the Sun JSSE.
      */
     public final static String DEFAULT_PROTOCOL_HANDLER_PACKAGES = 
-        "com.sun.net.ssl.internal.www.protocol";
+        "gnu.java.net.protocol";
 
     public final static String PROTOCOL_HANDLER_PACKAGES =
         "java.protocol.handler.pkgs";
--- ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java.sav	2005-08-24 15:49:40.000000000 -0400
+++ ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java	2007-03-08 17:23:25.000000000 -0500
@@ -30,8 +30,8 @@
 import org.apache.xmlrpc.XmlRpc;
 import org.apache.xmlrpc.XmlRpcServer;
 
-import com.sun.net.ssl.KeyManagerFactory;
-import com.sun.net.ssl.SSLContext;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
 
 /**
  * A minimal web server that exclusively handles XML-RPC requests
--- ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java.sav	2005-08-24 15:49:40.000000000 -0400
+++ ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java	2007-03-08 17:35:54.000000000 -0500
@@ -29,10 +29,11 @@
 import org.apache.xmlrpc.XmlRpcTransportFactory;
 import org.apache.xmlrpc.secure.SecurityTool;
 
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.X509TrustManager;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.X509TrustManager;
 
 /**
  * Interface from XML-RPC to the HTTPS transport based on the
@@ -55,14 +56,14 @@
     // The openTrustManager trusts all certificates
     private static X509TrustManager openTrustManager = new X509TrustManager()
     {
-        public boolean isClientTrusted(X509Certificate[] chain)
+        public void checkClientTrusted(X509Certificate[] chain, String authType)
         {
-            return true;
+            //return true;
         }
  
-        public boolean isServerTrusted(X509Certificate[] chain)
+        public void checkServerTrusted(X509Certificate[] chain, String authType)
         {
-            return true;
+            //return true;
         }
  
         public X509Certificate[] getAcceptedIssuers() 
@@ -74,7 +75,7 @@
     // The openHostnameVerifier trusts all hostnames
     private static HostnameVerifier openHostnameVerifier = new HostnameVerifier() 
     {
-        public boolean verify(String hostname, String session) 
+        public boolean verify(String hostname, SSLSession session) 
         {
             return true;
         }
@@ -86,8 +87,8 @@
 
         properties.setProperty(XmlRpcTransportFactory.TRANSPORT_URL, "(java.net.URL) - URL to connect to");
         properties.setProperty(XmlRpcTransportFactory.TRANSPORT_AUTH, "(java.lang.String) - HTTP Basic Authentication string (encoded).");
-        properties.setProperty(TRANSPORT_TRUSTMANAGER, "(com.sun.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
-        properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER, "(com.sun.net.ssl.HostnameVerifier) - Hostname verifier to use");
+        properties.setProperty(TRANSPORT_TRUSTMANAGER, "(javax.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
+        properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER, "(javax.net.ssl.HostnameVerifier) - Hostname verifier to use");
 
         return properties;
     }
@@ -99,7 +100,7 @@
         HostnameVerifier hostnameVerifier;
         SSLContext sslContext;
 
-        Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+        Security.addProvider(new gnu.javax.net.ssl.provider.Jessie());
 
         url = (URL) properties.get(XmlRpcTransportFactory.TRANSPORT_URL);
         auth = properties.getProperty(XmlRpcTransportFactory.TRANSPORT_AUTH);
--- ./build.xml.sav	2005-12-21 04:09:45.000000000 -0500
+++ ./build.xml	2007-03-08 17:23:25.000000000 -0500
@@ -94,7 +94,7 @@
 
   <target name="init" depends="env,copy-deps">
     <available 
-      classname="com.sun.net.ssl.SSLContext"
+      classname="javax.net.ssl.SSLContext"
       property="jsse.present"
       classpathref="classpath"
     />