Updated TLS-Scanner to TLS-Attacker 2.1

Author: ic0ns

pom.xml

@@ -3,18 +3,18 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>TLS-Scanner</artifactId>
     <groupId>de.rub.nds.tlsscanner</groupId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>TLS-Core</artifactId>
-            <version>2.0Beta4</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>Attacks</artifactId>
-            <version>2.0Beta4</version>
+            <version>2.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

src/main/java/de/rub/nds/tlsscanner/TLSScanner.java

@@ -74,7 +74,7 @@ public SiteReport scan() {
         testList.add(new CiphersuiteProbe(config));
         testList.add(new CiphersuiteOrderProbe(config));
         testList.add(new HeartbleedProbe(config));
-        // testList.add(new NamedCurvesProbe(websiteHost));
+        //testList.add(new NamedCurvesProbe(websiteHost));
         testList.add(new PaddingOracleProbe(config));
         testList.add(new BleichenbacherProbe(config));
         testList.add(new PoodleProbe(config));

src/main/java/de/rub/nds/tlsscanner/probe/CertificateProbe.java

@@ -38,7 +38,7 @@ public ProbeResult call() {
         tlsConfig.setQuickReceive(true);
         tlsConfig.setEarlyStop(true);
         tlsConfig.setWorkflowTraceType(WorkflowTraceType.HELLO);
-        tlsConfig.setSniHostname(tlsConfig.getConnectionEnd().getHostname());
+        tlsConfig.setSniHostname(tlsConfig.getDefaultClientConnection().getHostname());
         tlsConfig.setAddServerNameIndicationExtension(true);
         tlsConfig.setStopActionsAfterFatal(true);
         Certificate serverCert = CertificateFetcher.fetchServerCertificate(tlsConfig);

src/main/java/de/rub/nds/tlsscanner/probe/CiphersuiteOrderProbe.java

@@ -14,12 +14,10 @@
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
 import de.rub.nds.tlsattacker.core.exceptions.WorkflowExecutionException;
 import de.rub.nds.tlsattacker.core.state.State;
-import de.rub.nds.tlsattacker.core.state.TlsContext;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutor;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutorFactory;
 import de.rub.nds.tlsattacker.core.workflow.action.executor.WorkflowExecutorType;
 import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
-import de.rub.nds.tlsattacker.transport.ClientConnectionEnd;
 import de.rub.nds.tlsscanner.config.ScannerConfig;
 import de.rub.nds.tlsscanner.report.ProbeResult;
 import de.rub.nds.tlsscanner.report.ResultValue;

src/main/java/de/rub/nds/tlsscanner/probe/InvalidCurveProbe.java

@@ -9,9 +9,7 @@
 package de.rub.nds.tlsscanner.probe;
 
 import de.rub.nds.tlsattacker.attacks.config.InvalidCurveAttackConfig;
-import de.rub.nds.tlsattacker.attacks.config.PaddingOracleCommandConfig;
 import de.rub.nds.tlsattacker.attacks.impl.InvalidCurveAttacker;
-import de.rub.nds.tlsattacker.attacks.impl.PaddingOracleAttacker;
 import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
 import de.rub.nds.tlsscanner.config.ScannerConfig;
 import de.rub.nds.tlsscanner.report.ProbeResult;
@@ -39,9 +37,24 @@ public ProbeResult call() {
         delegate.setHost(getScannerConfig().getClientDelegate().getHost());
         InvalidCurveAttacker attacker = new InvalidCurveAttacker(invalidCurveAttackConfig);
         Boolean vulnerable = attacker.isVulnerable();
+        if (vulnerable == null) {
+            vulnerable = false; //TODO
+        }
         TLSCheck check = new TLSCheck(vulnerable, CheckType.ATTACK_INVALID_CURVE, 10);
         List<TLSCheck> checkList = new LinkedList<>();
         checkList.add(check);
+        invalidCurveAttackConfig = new InvalidCurveAttackConfig(getScannerConfig().getGeneralDelegate());
+        invalidCurveAttackConfig.setEphemeral(true);
+        delegate = (ClientDelegate) invalidCurveAttackConfig.getDelegate(ClientDelegate.class);
+        delegate.setHost(getScannerConfig().getClientDelegate().getHost());
+        attacker = new InvalidCurveAttacker(invalidCurveAttackConfig);
+        vulnerable = attacker.isVulnerable();
+        if (vulnerable == null) {
+            vulnerable = false; //TODO
+        }
+        check = new TLSCheck(vulnerable, CheckType.ATTACK_INVALID_CURVE_EPHEMERAL, 10);
+        checkList.add(check);
+        
         return new ProbeResult(getType(), new LinkedList<ResultValue>(), checkList);
     }
 }

src/main/java/de/rub/nds/tlsscanner/probe/ProtocolVersionProbe.java

@@ -18,7 +18,6 @@
 import de.rub.nds.tlsattacker.core.protocol.message.SSL2ServerHelloMessage;
 import de.rub.nds.tlsattacker.core.record.layer.RecordLayerType;
 import de.rub.nds.tlsattacker.core.state.State;
-import de.rub.nds.tlsattacker.core.state.TlsContext;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutor;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutorFactory;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowTrace;
@@ -128,10 +127,9 @@ private boolean isSSL2Supported() {
         tlsConfig.setEarlyStop(true);
         tlsConfig.setStopActionsAfterFatal(true);
         tlsConfig.setRecordLayerType(RecordLayerType.BLOB);
-        WorkflowTrace trace = new WorkflowTrace(tlsConfig);
+        WorkflowTrace trace = new WorkflowTrace();
         trace.addTlsAction(new SendAction(new SSL2ClientHelloMessage(tlsConfig)));
         trace.addTlsAction(new ReceiveAction(new SSL2ServerHelloMessage(tlsConfig)));
-        tlsConfig.setWorkflowTrace(trace);
         State state = new State(tlsConfig,trace);
         WorkflowExecutor executor = WorkflowExecutorFactory.createWorkflowExecutor(WorkflowExecutorType.DEFAULT, state);
         executor.executeWorkflow();

src/main/java/de/rub/nds/tlsscanner/report/check/CheckType.java

@@ -33,5 +33,7 @@ public enum CheckType {
     ATTACK_POODLE,
     ATTACK_TLS_POODLE,
     ATTACK_CVE20162107,
-    ATTACK_INVALID_CURVE
+    ATTACK_INVALID_CURVE,
+    ATTACK_INVALID_CURVE_EPHEMERAL
+    
 }