summaryrefslogtreecommitdiffstats
path: root/jrt
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-10-04 11:12:32 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-10-04 11:12:32 +0200
commit00c635b01a9ff113cdeb94dd821e96521b41c655 (patch)
tree789c9086ab61732e61c9a62cdcb6cd52f0499503 /jrt
parenta67d55136f07974d7258d8918dc4fbeb0901322e (diff)
Allow post-handshake messages
Don't fail when receiving post-handshake messages such as New Session Ticket Message.
Diffstat (limited to 'jrt')
-rw-r--r--jrt/src/com/yahoo/jrt/TlsCryptoSocket.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java
index 6bc70ca12f0..afed3efb9f1 100644
--- a/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java
+++ b/jrt/src/com/yahoo/jrt/TlsCryptoSocket.java
@@ -21,7 +21,6 @@ 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;
/**
@@ -247,7 +246,6 @@ 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();
@@ -279,7 +277,6 @@ 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();