Scaffolding for new SSLSession exportKeyingMaterial methods

Author: peterdettman

tls/src/main/java/org/bouncycastle/jsse/BCExtendedSSLSession.java

@@ -3,10 +3,23 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.crypto.SecretKey;
+import javax.net.ssl.SSLKeyException;
 import javax.net.ssl.SSLSession;
 
 public abstract class BCExtendedSSLSession implements SSLSession
 {
+    public byte[] exportKeyingMaterialData(String label, byte[] context, int length) throws SSLKeyException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public SecretKey exportKeyingMaterialKey(String keyAlg, String label, byte[] context, int length)
+        throws SSLKeyException
+    {
+        throw new UnsupportedOperationException();
+    }
+
     public abstract String[] getLocalSupportedSignatureAlgorithms();
 
     public String[] getLocalSupportedSignatureAlgorithmsBC()

tls/src/main/jdk25/org/bouncycastle/jsse/provider/ExportSSLSession_25.java

@@ -0,0 +1,28 @@
+package org.bouncycastle.jsse.provider;
+
+import javax.crypto.SecretKey;
+import javax.net.ssl.SSLKeyException;
+
+import org.bouncycastle.jsse.BCExtendedSSLSession;
+
+class ExportSSLSession_25
+    extends ExportSSLSession_9
+{
+    ExportSSLSession_25(BCExtendedSSLSession sslSession)
+    {
+        super(sslSession);
+    }
+
+    @Override
+    public byte[] exportKeyingMaterialData(String label, byte[] context, int length) throws SSLKeyException
+    {
+        return sslSession.exportKeyingMaterialData(label, context, length);
+    }
+
+    @Override
+    public SecretKey exportKeyingMaterialKey(String keyAlg, String label, byte[] context, int length)
+        throws SSLKeyException
+    {
+        return sslSession.exportKeyingMaterialKey(keyAlg, label, context, length);
+    }
+}

tls/src/main/jdk25/org/bouncycastle/jsse/provider/ImportSSLSession_25.java

@@ -0,0 +1,27 @@
+package org.bouncycastle.jsse.provider;
+
+import javax.crypto.SecretKey;
+import javax.net.ssl.ExtendedSSLSession;
+import javax.net.ssl.SSLKeyException;
+
+class ImportSSLSession_25
+    extends ImportSSLSession_9
+{
+    ImportSSLSession_25(ExtendedSSLSession sslSession)
+    {
+        super(sslSession);
+    }
+
+    @Override
+    public byte[] exportKeyingMaterialData(String label, byte[] context, int length) throws SSLKeyException
+    {
+        return sslSession.exportKeyingMaterialData(label, context, length);
+    }
+
+    @Override
+    public SecretKey exportKeyingMaterialKey(String keyAlg, String label, byte[] context, int length)
+        throws SSLKeyException
+    {
+        return sslSession.exportKeyingMaterialKey(keyAlg, label, context, length);
+    }
+}

tls/src/main/jdk25/org/bouncycastle/jsse/provider/SSLSessionUtil.java

@@ -0,0 +1,39 @@
+package org.bouncycastle.jsse.provider;
+
+import javax.net.ssl.ExtendedSSLSession;
+import javax.net.ssl.SSLSession;
+
+import org.bouncycastle.jsse.BCExtendedSSLSession;
+
+abstract class SSLSessionUtil
+{
+    static SSLSession exportSSLSession(BCExtendedSSLSession sslSession)
+    {
+        if (sslSession instanceof ImportSSLSession)
+        {
+            return ((ImportSSLSession)sslSession).unwrap();
+        }
+
+        return new ExportSSLSession_25(sslSession);
+    }
+
+    static BCExtendedSSLSession importSSLSession(SSLSession sslSession)
+    {
+        if (sslSession instanceof BCExtendedSSLSession)
+        {
+            return (BCExtendedSSLSession)sslSession;
+        }
+
+        if (sslSession instanceof ExportSSLSession)
+        {
+            return ((ExportSSLSession)sslSession).unwrap();
+        }
+
+        if (sslSession instanceof ExtendedSSLSession)
+        {
+            return new ImportSSLSession_25((ExtendedSSLSession)sslSession);
+        }
+
+        return new ImportSSLSession_5(sslSession);
+    }
+}