From 0014da0b50621603317e73b126d59b26380d6bb5 Mon Sep 17 00:00:00 2001 From: Robert Merget Date: Thu, 10 Oct 2024 16:57:46 +0400 Subject: [PATCH] removed dead code and unused imports --- .../ClientOptionsRequirement.java | 4 -- .../probe/closing/ConnectionClosingUtils.java | 6 --- .../vector/response/ResponseExtractor.java | 39 ------------------- .../ServerOptionsRequirement.java | 3 -- 4 files changed, 52 deletions(-) diff --git a/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/requirements/ClientOptionsRequirement.java b/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/requirements/ClientOptionsRequirement.java index 04bacd9c8..b4f643c0d 100644 --- a/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/requirements/ClientOptionsRequirement.java +++ b/TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/requirements/ClientOptionsRequirement.java @@ -8,10 +8,6 @@ */ package de.rub.nds.tlsscanner.clientscanner.probe.requirements; -import static de.rub.nds.tlsscanner.core.constants.TlsProbeType.ALPN; -import static de.rub.nds.tlsscanner.core.constants.TlsProbeType.RESUMPTION; -import static de.rub.nds.tlsscanner.core.constants.TlsProbeType.SNI; - import de.rub.nds.scanner.core.probe.requirements.Requirement; import de.rub.nds.tlsscanner.clientscanner.config.ClientScannerConfig; import de.rub.nds.tlsscanner.clientscanner.report.ClientReport; diff --git a/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/closing/ConnectionClosingUtils.java b/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/closing/ConnectionClosingUtils.java index 3b08f5107..431352cbf 100644 --- a/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/closing/ConnectionClosingUtils.java +++ b/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/probe/closing/ConnectionClosingUtils.java @@ -8,12 +8,6 @@ */ package de.rub.nds.tlsscanner.core.probe.closing; -import static de.rub.nds.tlsattacker.transport.socket.SocketState.CLOSED; -import static de.rub.nds.tlsattacker.transport.socket.SocketState.IO_EXCEPTION; -import static de.rub.nds.tlsattacker.transport.socket.SocketState.PEER_WRITE_CLOSED; -import static de.rub.nds.tlsattacker.transport.socket.SocketState.SOCKET_EXCEPTION; -import static de.rub.nds.tlsattacker.transport.socket.SocketState.TIMEOUT; - import de.rub.nds.tlsattacker.core.config.Config; import de.rub.nds.tlsattacker.core.constants.RunningModeType; import de.rub.nds.tlsattacker.core.state.State; diff --git a/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/vector/response/ResponseExtractor.java b/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/vector/response/ResponseExtractor.java index 02d6dda3f..f8843ba2b 100644 --- a/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/vector/response/ResponseExtractor.java +++ b/TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/vector/response/ResponseExtractor.java @@ -8,14 +8,12 @@ */ package de.rub.nds.tlsscanner.core.vector.response; -import de.rub.nds.tlsattacker.core.constants.ProtocolMessageType; import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage; import de.rub.nds.tlsattacker.core.record.Record; import de.rub.nds.tlsattacker.core.state.State; import de.rub.nds.tlsattacker.core.workflow.action.ReceivingAction; import de.rub.nds.tlsattacker.transport.socket.SocketState; import de.rub.nds.tlsattacker.transport.tcp.TcpTransportHandler; -import java.util.LinkedList; import java.util.List; public class ResponseExtractor { @@ -43,42 +41,5 @@ private static SocketState extractSocketState(State state) { } } - @Deprecated - private static List> extractRecordClasses(ReceivingAction action) { - List> classList = new LinkedList<>(); - if (action.getReceivedRecords() != null) { - for (Record record : action.getReceivedRecords()) { - classList.add((Class) record.getClass()); - } - } - return classList; - } - - private static List> extractMessageClasses(ReceivingAction action) { - List> classList = new LinkedList<>(); - if (action.getReceivedMessages() != null) { - for (ProtocolMessage message : action.getReceivedMessages()) { - classList.add((Class) message.getClass()); - } - } - return classList; - } - - private static boolean didReceiveEncryptedAlert(ReceivingAction action) { - if (action.getReceivedRecords() != null) { - for (Record abstractRecord : action.getReceivedRecords()) { - if (abstractRecord instanceof Record) { - Record record = (Record) abstractRecord; - if (record.getContentMessageType() == ProtocolMessageType.ALERT) { - if (record.getLength().getValue() > 6) { - return true; - } - } - } - } - } - return false; - } - private ResponseExtractor() {} } diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/requirements/ServerOptionsRequirement.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/requirements/ServerOptionsRequirement.java index fe0eade10..a892a00d1 100644 --- a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/requirements/ServerOptionsRequirement.java +++ b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/requirements/ServerOptionsRequirement.java @@ -8,9 +8,6 @@ */ package de.rub.nds.tlsscanner.serverscanner.probe.requirements; -import static de.rub.nds.tlsscanner.core.constants.TlsProbeType.HTTP_FALSE_START; -import static de.rub.nds.tlsscanner.core.constants.TlsProbeType.HTTP_HEADER; - import de.rub.nds.scanner.core.probe.requirements.Requirement; import de.rub.nds.tlsscanner.core.constants.TlsProbeType; import de.rub.nds.tlsscanner.core.probe.requirements.OptionsRequirement;