diff options
author | Håvard Pettersen <havardpe@oath.com> | 2020-02-12 14:31:29 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2020-02-12 14:31:29 +0000 |
commit | 5da0cd083e73d7f848803e2bfa735e2529d146e7 (patch) | |
tree | 3075dc89de08b5e7a77db27b7f365775061a3544 /jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java | |
parent | 5d657d4537d753b09f9cedce19f785c35eba2d80 (diff) |
pass connection spec to crypto engine
when being a client, for hostname validation
Diffstat (limited to 'jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java')
-rw-r--r-- | jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java index 5c4510665e7..60b7f342c9c 100644 --- a/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java +++ b/jrt/src/com/yahoo/jrt/MaybeTlsCryptoSocket.java @@ -61,8 +61,8 @@ public class MaybeTlsCryptoSocket implements CryptoSocket { private TlsCryptoEngine factory; private Buffer buffer; - MyCryptoSocket(SocketChannel channel, TlsCryptoEngine factory, boolean isServer) { - super(channel, isServer); + MyCryptoSocket(SocketChannel channel, TlsCryptoEngine factory) { + super(channel, true); this.factory = factory; this.buffer = new Buffer(4096); } @@ -81,7 +81,7 @@ public class MaybeTlsCryptoSocket implements CryptoSocket { data[i] = src.get(i); } if (looksLikeTlsToMe(data)) { - TlsCryptoSocket tlsSocket = factory.createCryptoSocket(channel(), true); + TlsCryptoSocket tlsSocket = factory.createServerCryptoSocket(channel()); tlsSocket.injectReadData(buffer); socket = tlsSocket; return socket.handshake(); @@ -117,8 +117,8 @@ public class MaybeTlsCryptoSocket implements CryptoSocket { } } - public MaybeTlsCryptoSocket(SocketChannel channel, TlsCryptoEngine factory, boolean isServer) { - this.socket = new MyCryptoSocket(channel, factory, isServer); + public MaybeTlsCryptoSocket(SocketChannel channel, TlsCryptoEngine factory) { + this.socket = new MyCryptoSocket(channel, factory); } @Override public SocketChannel channel() { return socket.channel(); } |