Use TlsContext to construct TlsCryptoEngine

3 files changed, 29 insertions, 6 deletions

diff --git a/jrt/tests/com/yahoo/jrt/CryptoUtils.java b/jrt/tests/com/yahoo/jrt/CryptoUtils.java
index 6c843000779..b23f71d6033 100644
--- a/jrt/tests/com/yahoo/jrt/CryptoUtils.java
+++ b/jrt/tests/com/yahoo/jrt/CryptoUtils.java
@@ -5,6 +5,7 @@ import com.yahoo.security.KeyStoreBuilder;
 import com.yahoo.security.KeyUtils;
 import com.yahoo.security.SslContextBuilder;
 import com.yahoo.security.X509CertificateBuilder;
+import com.yahoo.security.tls.TlsContext;
 import com.yahoo.security.tls.authz.PeerAuthorizerTrustManager.Mode;
 import com.yahoo.security.tls.authz.PeerAuthorizerTrustManagersFactory;
 import com.yahoo.security.tls.policy.AuthorizedPeers;
@@ -15,6 +16,7 @@ import com.yahoo.security.tls.policy.RequiredPeerCredential.Field;
 import com.yahoo.security.tls.policy.Role;
 
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
 import javax.security.auth.x500.X500Principal;
 import java.security.KeyPair;
 import java.security.KeyStore;
@@ -34,6 +36,12 @@ import static java.util.Collections.singletonList;
  * @author bjorncs
  */
 class CryptoUtils {
+    static final SSLContext testSslContext = createTestSslContext();
+
+    static TlsContext createTestTlsContext() {
+        return new StaticTlsContext(testSslContext);
+    }
+
     static SSLContext createTestSslContext() {
         KeyPair keyPair = KeyUtils.generateKeypair(RSA);
 
@@ -64,4 +72,19 @@ class CryptoUtils {
                                         new RequiredPeerCredential(
                                                 Field.CN, new HostGlobPattern("dummy"))))));
     }
+
+    private static class StaticTlsContext implements TlsContext {
+
+        final SSLContext sslContext;
+
+        StaticTlsContext(SSLContext sslContext) {
+            this.sslContext = sslContext;
+        }
+
+        @Override
+        public SSLEngine createSslEngine() {
+            return sslContext.createSSLEngine();
+        }
+
+    }
 }
diff --git a/jrt/tests/com/yahoo/jrt/EchoTest.java b/jrt/tests/com/yahoo/jrt/EchoTest.java
index ff036af183b..09841cb3c04 100644
--- a/jrt/tests/com/yahoo/jrt/EchoTest.java
+++ b/jrt/tests/com/yahoo/jrt/EchoTest.java
@@ -9,7 +9,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
-import static com.yahoo.jrt.CryptoUtils.createTestSslContext;
+import static com.yahoo.jrt.CryptoUtils.createTestTlsContext;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
@@ -23,9 +23,9 @@ public class EchoTest {
 
     @Parameter public CryptoEngine crypto;
     @Parameters(name = "{0}") public static Object[] engines() {
-        return new Object[] { new NullCryptoEngine(), new XorCryptoEngine(), new TlsCryptoEngine(createTestSslContext()),
-                              new MaybeTlsCryptoEngine(new TlsCryptoEngine(createTestSslContext()), false),
-                              new MaybeTlsCryptoEngine(new TlsCryptoEngine(createTestSslContext()), true) };
+        return new Object[] { new NullCryptoEngine(), new XorCryptoEngine(), new TlsCryptoEngine(createTestTlsContext()),
+                              new MaybeTlsCryptoEngine(new TlsCryptoEngine(createTestTlsContext()), false),
+                              new MaybeTlsCryptoEngine(new TlsCryptoEngine(createTestTlsContext()), true) };
     }
 
     @Before
diff --git a/jrt/tests/com/yahoo/jrt/SessionTest.java b/jrt/tests/com/yahoo/jrt/SessionTest.java
index 2d8f9188623..368e898978a 100644
--- a/jrt/tests/com/yahoo/jrt/SessionTest.java
+++ b/jrt/tests/com/yahoo/jrt/SessionTest.java
@@ -9,7 +9,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
-import static com.yahoo.jrt.CryptoUtils.createTestSslContext;
+import static com.yahoo.jrt.CryptoUtils.createTestTlsContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -19,7 +19,7 @@ public class SessionTest implements SessionHandler {
 
     @Parameter public CryptoEngine crypto;
     @Parameters(name = "{0}") public static Object[] engines() {
-        return new Object[] { new NullCryptoEngine(), new XorCryptoEngine(), new TlsCryptoEngine(createTestSslContext()) };
+        return new Object[] { new NullCryptoEngine(), new XorCryptoEngine(), new TlsCryptoEngine(createTestTlsContext()) };
     }
 
     private static class Session {