work on multi-release jar build for BC TLS.

ant/jdk15+.xml

@@ -38,6 +38,7 @@
             <fileset dir="prov/src/test/resources" includes="**/*.*" />
 
             <fileset dir="tls/src/main/java" includes="**/*.java" />
+            <fileset dir="tls/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="tls/src/main/javadoc" includes="**/*.html" />
             <fileset dir="tls/src/test/java" includes="**/*.java" />
             <fileset dir="tls/src/test/resources" includes="**/*.*" />

pkix/src/main/jdk1.9/module-info.java

@@ -1,5 +1,7 @@
 module org.bouncycastle.pkix
 {
+    requires java.logging;
+    requires java.naming;
     requires org.bouncycastle.provider;
 
     exports org.bouncycastle.cert;

prov/src/main/jdk1.9/module-info.java

@@ -1,5 +1,8 @@
 module org.bouncycastle.provider
 {
+    requires java.sql;
+    requires java.naming;
+
     exports org.bouncycastle;
     exports org.bouncycastle.asn1;
     exports org.bouncycastle.asn1.anssi;

tls/src/main/jdk1.9/module-info.java

@@ -1,10 +1,14 @@
 module org.bouncycastle.tls
 {
+    provides java.security.Provider with org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
+
+    requires java.logging;
     requires org.bouncycastle.provider;
 
     exports org.bouncycastle.jsse;
     exports org.bouncycastle.tls;
     exports org.bouncycastle.jsse.provider;
+    exports org.bouncycastle.jsse.java.security;
     exports org.bouncycastle.tls.crypto;
     exports org.bouncycastle.tls.crypto.impl;
     exports org.bouncycastle.tls.crypto.impl.bc;

tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/ExportSSLSession_5.java

@@ -0,0 +1,149 @@
+package org.bouncycastle.jsse.provider;
+
+import java.security.Principal;
+import java.security.cert.Certificate;
+
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSessionContext;
+
+import org.bouncycastle.jsse.BCExtendedSSLSession;
+
+class ExportSSLSession_5
+    implements SSLSession, ExportSSLSession
+{
+    final BCExtendedSSLSession sslSession;
+
+    ExportSSLSession_5(BCExtendedSSLSession sslSession)
+    {
+        this.sslSession = sslSession;
+    }
+
+    public BCExtendedSSLSession unwrap()
+    {
+        return sslSession;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return null != obj && obj.equals(sslSession);
+    }
+
+    public int getApplicationBufferSize()
+    {
+        return sslSession.getApplicationBufferSize();
+    }
+
+    public String getCipherSuite()
+    {
+        return sslSession.getCipherSuite();
+    }
+
+    public long getCreationTime()
+    {
+        return sslSession.getCreationTime();
+    }
+
+    public byte[] getId()
+    {
+        return sslSession.getId();
+    }
+
+    public long getLastAccessedTime()
+    {
+        return sslSession.getLastAccessedTime();
+    }
+
+    public Certificate[] getLocalCertificates()
+    {
+        return sslSession.getLocalCertificates();
+    }
+
+    public Principal getLocalPrincipal()
+    {
+        return sslSession.getLocalPrincipal();
+    }
+
+    public int getPacketBufferSize()
+    {
+        return sslSession.getPacketBufferSize();
+    }
+
+    public javax.security.cert.X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException
+    {
+        return sslSession.getPeerCertificateChain();
+    }
+
+    public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException
+    {
+        return sslSession.getPeerCertificates();
+    }
+
+    public String getPeerHost()
+    {
+        return sslSession.getPeerHost();
+    }
+
+    public int getPeerPort()
+    {
+        return sslSession.getPeerPort();
+    }
+
+    public Principal getPeerPrincipal() throws SSLPeerUnverifiedException
+    {
+        return sslSession.getPeerPrincipal();
+    }
+
+    public String getProtocol()
+    {
+        return sslSession.getProtocol();
+    }
+
+    public SSLSessionContext getSessionContext()
+    {
+        return sslSession.getSessionContext();
+    }
+
+    public Object getValue(String name)
+    {
+        return sslSession.getValue(name);
+    }
+
+    public String[] getValueNames()
+    {
+        return sslSession.getValueNames();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return sslSession.hashCode();
+    }
+
+    public void invalidate()
+    {
+        sslSession.invalidate();
+    }
+
+    public boolean isValid()
+    {
+        return sslSession.isValid();
+    }
+
+    public void putValue(String name, Object value)
+    {
+        sslSession.putValue(name, value);
+    }
+
+    public void removeValue(String name)
+    {
+        sslSession.removeValue(name);
+    }
+
+    @Override
+    public String toString()
+    {
+        return sslSession.toString();
+    }
+}

tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/ExportSSLSession_7.java

@@ -0,0 +1,160 @@
+package org.bouncycastle.jsse.provider;
+
+import java.security.Principal;
+import java.security.cert.Certificate;
+
+import javax.net.ssl.ExtendedSSLSession;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSessionContext;
+
+import org.bouncycastle.jsse.BCExtendedSSLSession;
+
+class ExportSSLSession_7
+    extends ExtendedSSLSession
+    implements ExportSSLSession
+{
+    final BCExtendedSSLSession sslSession;
+
+    ExportSSLSession_7(BCExtendedSSLSession sslSession)
+    {
+        this.sslSession = sslSession;
+    }
+
+    public BCExtendedSSLSession unwrap()
+    {
+        return sslSession;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        return null != obj && obj.equals(sslSession);
+    }
+
+    public int getApplicationBufferSize()
+    {
+        return sslSession.getApplicationBufferSize();
+    }
+
+    public String getCipherSuite()
+    {
+        return sslSession.getCipherSuite();
+    }
+
+    public long getCreationTime()
+    {
+        return sslSession.getCreationTime();
+    }
+
+    public byte[] getId()
+    {
+        return sslSession.getId();
+    }
+
+    public long getLastAccessedTime()
+    {
+        return sslSession.getLastAccessedTime();
+    }
+
+    public Certificate[] getLocalCertificates()
+    {
+        return sslSession.getLocalCertificates();
+    }
+
+    public Principal getLocalPrincipal()
+    {
+        return sslSession.getLocalPrincipal();
+    }
+
+    public String[] getLocalSupportedSignatureAlgorithms()
+    {
+        return sslSession.getLocalSupportedSignatureAlgorithms();
+    }
+
+    public int getPacketBufferSize()
+    {
+        return sslSession.getPacketBufferSize();
+    }
+
+    public javax.security.cert.X509Certificate[] getPeerCertificateChain() throws SSLPeerUnverifiedException
+    {
+        return sslSession.getPeerCertificateChain();
+    }
+
+    public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException
+    {
+        return sslSession.getPeerCertificates();
+    }
+
+    public String getPeerHost()
+    {
+        return sslSession.getPeerHost();
+    }
+
+    public int getPeerPort()
+    {
+        return sslSession.getPeerPort();
+    }
+
+    public Principal getPeerPrincipal() throws SSLPeerUnverifiedException
+    {
+        return sslSession.getPeerPrincipal();
+    }
+
+    public String[] getPeerSupportedSignatureAlgorithms()
+    {
+        return sslSession.getPeerSupportedSignatureAlgorithms();
+    }
+
+    public String getProtocol()
+    {
+        return sslSession.getProtocol();
+    }
+
+    public SSLSessionContext getSessionContext()
+    {
+        return sslSession.getSessionContext();
+    }
+
+    public Object getValue(String name)
+    {
+        return sslSession.getValue(name);
+    }
+
+    public String[] getValueNames()
+    {
+        return sslSession.getValueNames();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return sslSession.hashCode();
+    }
+
+    public void invalidate()
+    {
+        sslSession.invalidate();
+    }
+
+    public boolean isValid()
+    {
+        return sslSession.isValid();
+    }
+
+    public void putValue(String name, Object value)
+    {
+        sslSession.putValue(name, value);
+    }
+
+    public void removeValue(String name)
+    {
+        sslSession.removeValue(name);
+    }
+
+    @Override
+    public String toString()
+    {
+        return sslSession.toString();
+    }
+}

tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/ExportSSLSession_8.java

@@ -0,0 +1,22 @@
+package org.bouncycastle.jsse.provider;
+
+import java.util.List;
+
+import javax.net.ssl.SNIServerName;
+
+import org.bouncycastle.jsse.BCExtendedSSLSession;
+
+class ExportSSLSession_8
+    extends ExportSSLSession_7
+{
+    ExportSSLSession_8(BCExtendedSSLSession sslSession)
+    {
+        super(sslSession);
+    }
+
+    @SuppressWarnings("unchecked")
+    public List<SNIServerName> getRequestedServerNames()
+    {
+        return (List<SNIServerName>)JsseUtils_8.exportSNIServerNames(sslSession.getRequestedServerNames());
+    }
+}

tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/ExportSSLSession_9.java

@@ -0,0 +1,19 @@
+package org.bouncycastle.jsse.provider;
+
+import java.util.List;
+
+import org.bouncycastle.jsse.BCExtendedSSLSession;
+
+class ExportSSLSession_9
+    extends ExportSSLSession_8
+{
+    ExportSSLSession_9(BCExtendedSSLSession sslSession)
+    {
+        super(sslSession);
+    }
+
+    public List<byte[]> getStatusResponses()
+    {
+        return sslSession.getStatusResponses();
+    }
+}