diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-10-04 15:22:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-04 15:22:43 +0200 |
commit | 9fc78a5e18f7388a5306881b2beaa78e3bd226b7 (patch) | |
tree | ca35c3c5e1309d58f7f3e470367ea04c31a57459 /jrt | |
parent | 7bb9233afcf04a82bf8210c910450f0efc5f83f5 (diff) | |
parent | a063dc90967912febc1e26c0baf634cd57ea5560 (diff) |
Merge pull request #10882 from vespa-engine/revert-10877-bjorncs/jdisc-tls13
Revert "Bjorncs/jdisc tls13"
Diffstat (limited to 'jrt')
-rw-r--r-- | jrt/src/com/yahoo/jrt/TlsCryptoSocket.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java index afed3efb9f1..6bc70ca12f0 100644 --- a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java +++ b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java @@ -21,6 +21,7 @@ import java.util.Optional; import java.util.logging.Logger; import static java.util.stream.Collectors.toList; +import static javax.net.ssl.SSLEngineResult.HandshakeStatus; import static javax.net.ssl.SSLEngineResult.Status; /** @@ -246,6 +247,7 @@ public class TlsCryptoSocket implements CryptoSocket { private int applicationDataWrap(ByteBuffer src) throws IOException { SSLEngineResult result = sslEngineWrap(src); + if (result.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING) throw new SSLException("Renegotiation detected"); switch (result.getStatus()) { case OK: return result.bytesConsumed(); @@ -277,6 +279,7 @@ public class TlsCryptoSocket implements CryptoSocket { private int applicationDataUnwrap(ByteBuffer dst) throws IOException { SSLEngineResult result = sslEngineUnwrap(dst); + if (result.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING) throw new SSLException("Renegotiation detected"); switch (result.getStatus()) { case OK: return result.bytesProduced(); |