summaryrefslogtreecommitdiffstats
path: root/jrt/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2019-10-04 15:18:47 +0200
committerGitHub <noreply@github.com>2019-10-04 15:18:47 +0200
commita063dc90967912febc1e26c0baf634cd57ea5560 (patch)
treeca35c3c5e1309d58f7f3e470367ea04c31a57459 /jrt/src
parent7bb9233afcf04a82bf8210c910450f0efc5f83f5 (diff)
Revert "Bjorncs/jdisc tls13"
Diffstat (limited to 'jrt/src')
-rw-r--r--jrt/src/com/yahoo/jrt/TlsCryptoSocket.java3
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();