Merge branch 'main' into prf_fix

Author: ic0ns

TLS-Client-Scanner/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tls.scanner</groupId>
         <artifactId>tls-scanner</artifactId>
-        <version>6.1.0</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
     <artifactId>tls-client-scanner</artifactId>
 
@@ -13,7 +13,7 @@
     <scm>
         <connection>scm:git:https://github.com/tls-attacker/TLS-Scanner.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/tls-attacker/TLS-Scanner-Development.git</developerConnection>
-        <tag>v6.1.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/tls-attacker/TLS-Scanner</url>
     </scm>
 

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;

TLS-Scanner-Core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tls.scanner</groupId>
         <artifactId>tls-scanner</artifactId>
-        <version>6.1.0</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
     <artifactId>tls-scanner-core</artifactId>
 
@@ -13,7 +13,7 @@
     <scm>
         <connection>scm:git:https://github.com/tls-attacker/TLS-Scanner.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/tls-attacker/TLS-Scanner-Development.git</developerConnection>
-        <tag>v6.1.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/tls-attacker/TLS-Scanner</url>
     </scm>
 

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;

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<Class<Record>> extractRecordClasses(ReceivingAction action) {
-        List<Class<Record>> classList = new LinkedList<>();
-        if (action.getReceivedRecords() != null) {
-            for (Record record : action.getReceivedRecords()) {
-                classList.add((Class<Record>) record.getClass());
-            }
-        }
-        return classList;
-    }
-
-    private static List<Class<ProtocolMessage>> extractMessageClasses(ReceivingAction action) {
-        List<Class<ProtocolMessage>> classList = new LinkedList<>();
-        if (action.getReceivedMessages() != null) {
-            for (ProtocolMessage message : action.getReceivedMessages()) {
-                classList.add((Class<ProtocolMessage>) 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() {}
 }

TLS-Server-Scanner/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tls.scanner</groupId>
         <artifactId>tls-scanner</artifactId>
-        <version>6.1.0</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
     <artifactId>tls-server-scanner</artifactId>
 
@@ -13,7 +13,7 @@
     <scm>
         <connection>scm:git:https://github.com/tls-attacker/TLS-Scanner.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/tls-attacker/TLS-Scanner-Development.git</developerConnection>
-        <tag>v6.1.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/tls-attacker/TLS-Scanner</url>
     </scm>
 

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;

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>de.rub.nds.tls.scanner</groupId>
     <artifactId>tls-scanner</artifactId>
-    <version>6.1.0</version>
+    <version>6.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>TLS-Scanner</name>
@@ -48,7 +48,7 @@
     <scm>
         <connection>scm:git:https://github.com/tls-attacker/TLS-Scanner.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/tls-attacker/TLS-Scanner-Development.git</developerConnection>
-        <tag>v6.1.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/tls-attacker/TLS-Scanner</url>
     </scm>