Merge pull request #22 from RUB-NDS/scannerfix

Scannerfix

Author: ic0ns

pom.xml

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

src/main/java/de/rub/nds/tlsscanner/report/result/ExtensionResult.java

@@ -8,7 +8,6 @@
 import de.rub.nds.tlsattacker.core.constants.ExtensionType;
 import de.rub.nds.tlsscanner.constants.ProbeType;
 import de.rub.nds.tlsscanner.report.SiteReport;
-import de.rub.nds.tlsscanner.report.result.ProbeResult;
 import java.util.List;
 
 /**
@@ -36,10 +35,10 @@ public void merge(SiteReport report) {
         }
         for (ExtensionType type : allSupportedExtensions) {
             if (type == ExtensionType.ENCRYPT_THEN_MAC) {
-                extendedMasterSecret = true;
+                encryptThenMac = true;
             }
             if (type == ExtensionType.EXTENDED_MASTER_SECRET) {
-                encryptThenMac = true;
+                 extendedMasterSecret = true;
             }
             if (type == ExtensionType.RENEGOTIATION_INFO) {
                 secureRenegotiation = true;