diff options
Diffstat (limited to 'jrt')
-rw-r--r-- | jrt/src/com/yahoo/jrt/TlsCryptoEngine.java (renamed from jrt/src/com/yahoo/jrt/SslEngine.java) | 12 | ||||
-rw-r--r-- | jrt/src/com/yahoo/jrt/TlsCryptoSocket.java (renamed from jrt/src/com/yahoo/jrt/SslSocket.java) | 6 | ||||
-rw-r--r-- | jrt/tests/com/yahoo/jrt/EchoTest.java | 2 | ||||
-rw-r--r-- | jrt/tests/com/yahoo/jrt/SessionTest.java | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/jrt/src/com/yahoo/jrt/SslEngine.java b/jrt/src/com/yahoo/jrt/TlsCryptoEngine.java index 7bd77af2cfe..279bf1d0137 100644 --- a/jrt/src/com/yahoo/jrt/SslEngine.java +++ b/jrt/src/com/yahoo/jrt/TlsCryptoEngine.java @@ -3,28 +3,26 @@ package com.yahoo.jrt; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; -import java.io.IOException; import java.nio.channels.SocketChannel; /** - * A {@link CryptoSocket} that creates {@link SslSocket} instances. + * A {@link CryptoSocket} that creates {@link TlsCryptoSocket} instances. * * @author bjorncs */ -public class SslEngine implements CryptoEngine { +public class TlsCryptoEngine implements CryptoEngine { private final SSLContext sslContext; - public SslEngine(SSLContext sslContext) { + public TlsCryptoEngine(SSLContext sslContext) { this.sslContext = sslContext; } @Override - public SslSocket createCryptoSocket(SocketChannel channel, boolean isServer) { + public TlsCryptoSocket createCryptoSocket(SocketChannel channel, boolean isServer) { SSLEngine sslEngine = sslContext.createSSLEngine(); sslEngine.setNeedClientAuth(true); sslEngine.setUseClientMode(!isServer); - return new SslSocket(channel, sslEngine); + return new TlsCryptoSocket(channel, sslEngine); } } diff --git a/jrt/src/com/yahoo/jrt/SslSocket.java b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java index 51b10b1ef99..36d470bf67b 100644 --- a/jrt/src/com/yahoo/jrt/SslSocket.java +++ b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java @@ -18,9 +18,9 @@ import static javax.net.ssl.SSLEngineResult.*; * * @author bjorncs */ -public class SslSocket implements CryptoSocket { +public class TlsCryptoSocket implements CryptoSocket { - private static final Logger log = Logger.getLogger(SslSocket.class.getName()); + private static final Logger log = Logger.getLogger(TlsCryptoSocket.class.getName()); private enum HandshakeState { NOT_STARTED, NEED_READ, NEED_WRITE, COMPLETED } @@ -31,7 +31,7 @@ public class SslSocket implements CryptoSocket { private ByteBuffer handshakeDummyBuffer; private HandshakeState handshakeState; - public SslSocket(SocketChannel channel, SSLEngine sslEngine) { + public TlsCryptoSocket(SocketChannel channel, SSLEngine sslEngine) { this.channel = channel; this.sslEngine = sslEngine; SSLSession nullSession = sslEngine.getSession(); diff --git a/jrt/tests/com/yahoo/jrt/EchoTest.java b/jrt/tests/com/yahoo/jrt/EchoTest.java index c7fcb154766..a91ac117f41 100644 --- a/jrt/tests/com/yahoo/jrt/EchoTest.java +++ b/jrt/tests/com/yahoo/jrt/EchoTest.java @@ -23,7 +23,7 @@ public class EchoTest { @Parameter public CryptoEngine crypto; @Parameters(name = "{0}") public static Object[] engines() { - return new Object[] { CryptoEngine.createDefault(), new XorCryptoEngine(), new SslEngine(createTestSslContext()) }; + return new Object[] { CryptoEngine.createDefault(), new XorCryptoEngine(), new TlsCryptoEngine(createTestSslContext()) }; } @Before diff --git a/jrt/tests/com/yahoo/jrt/SessionTest.java b/jrt/tests/com/yahoo/jrt/SessionTest.java index 3c06d3f9b69..63d14601b6e 100644 --- a/jrt/tests/com/yahoo/jrt/SessionTest.java +++ b/jrt/tests/com/yahoo/jrt/SessionTest.java @@ -19,7 +19,7 @@ public class SessionTest implements SessionHandler { @Parameter public CryptoEngine crypto; @Parameters(name = "{0}") public static Object[] engines() { - return new Object[] { CryptoEngine.createDefault(), new XorCryptoEngine(), new SslEngine(createTestSslContext()) }; + return new Object[] { CryptoEngine.createDefault(), new XorCryptoEngine(), new TlsCryptoEngine(createTestSslContext()) }; } private static class Session { |