Merge pull request #49 from RUB-NDS/v28v26

V28v26

Author: ic0ns

README.md

@@ -4,7 +4,7 @@ TLS-Scanner is a tool created by the Chair for Network and Data Security from th
 **Please note:**  *TLS-Scanner is a research tool intended for TLS developers, pentesters, administrators and researchers. There is no GUI. It is in the first version and may contain some bugs.*
 
 # Compiling
-In order to compile and use TLS-Scanner, you need to have Java and Maven installed, as well as [TLS-Attacker](https://github.com/RUB-NDS/TLS-Attacker) in Version 2.6
+In order to compile and use TLS-Scanner, you need to have Java and Maven installed, as well as [TLS-Attacker](https://github.com/RUB-NDS/TLS-Attacker) in Version 2.8
 
 ```bash
 $ cd TLS-Scanner
@@ -23,7 +23,7 @@ $ mvn clean install
 
 For hints on installing the required libraries checkout the corresponding GitHub repositories.
 
-**Please note:**  *In order to run this tool you need TLS-Attacker version 2.6*
+**Please note:**  *In order to run this tool you need TLS-Attacker version 2.8*
 
 # Running
 In order to run TLS-Scanner you need to run the jar file in the apps/ folder.

pom.xml

@@ -3,18 +3,18 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>TLS-Scanner</artifactId>
     <groupId>de.rub.nds.tlsscanner</groupId>
-    <version>2.5</version>
+    <version>2.6</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>TLS-Core</artifactId>
-            <version>2.7</version>
+            <version>2.8</version>
         </dependency>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>Attacks</artifactId>
-            <version>2.7</version>
+            <version>2.8</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -57,12 +57,12 @@
         </profile>
     </profiles>
     <build>
-        <finalName>TLS-Scanner</finalName>              
+        <finalName>TLS-Scanner</finalName>
         <plugins>
-            <plugin> 
-                <artifactId>maven-dependency-plugin</artifactId> 
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-                    <execution>             
+                    <execution>
                         <id>copy</id>
                         <phase>package</phase>
                         <goals>
@@ -83,17 +83,17 @@
                     </execution>
                     <execution>
                         <id>copy-dependencies</id>
-                        <phase>package</phase> 
-                        <goals> 
-                            <goal>copy-dependencies</goal> 
-                        </goals> 
-                        <configuration> 
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
                             <outputDirectory>${basedir}/apps/lib</outputDirectory>
                             <!--Ensures only runnable dependencies are included-->
-                            <includeScope>compile</includeScope> 
-                        </configuration> 
-                    </execution> 
-                </executions> 
+                            <includeScope>compile</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <!-- Build an executable JAR -->

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

@@ -55,11 +55,12 @@ public ProbeResult executeTest() {
         }
         LOGGER.info("Fetched the following server public key: " + publicKey);
         List<Pkcs1Vector> pkcs1Vectors;
-        if (scannerConfig.getScanDetail() == ScannerDetail.NORMAL) {
-            pkcs1Vectors = Pkcs1VectorGenerator.generatePkcs1Vectors(publicKey, BleichenbacherCommandConfig.Type.FAST,
+        if (scannerConfig.getScanDetail().isGreaterEqualTo(ScannerDetail.DETAILED)) {
+            pkcs1Vectors = Pkcs1VectorGenerator.generatePkcs1Vectors(publicKey, BleichenbacherCommandConfig.Type.FULL,
                     bleichenbacherConfig.createConfig().getDefaultHighestClientProtocolVersion());
+
         } else {
-            pkcs1Vectors = Pkcs1VectorGenerator.generatePkcs1Vectors(publicKey, BleichenbacherCommandConfig.Type.FULL,
+            pkcs1Vectors = Pkcs1VectorGenerator.generatePkcs1Vectors(publicKey, BleichenbacherCommandConfig.Type.FAST,
                     bleichenbacherConfig.createConfig().getDefaultHighestClientProtocolVersion());
         }
         List<BleichenbacherTestResult> resultList = new LinkedList<>();

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

@@ -128,10 +128,12 @@ public ProbeResult executeTest() {
                 }
             }
         }
-        if (vulnerable && recordGeneratorType != PaddingRecordGeneratorType.SHORT) {
+        if (vulnerable && (ScannerDetail.QUICK != scannerConfig.getScanDetail())) {
             testResultList.clear();
             //Perform full scan
-            recordGeneratorType = PaddingRecordGeneratorType.SHORT;
+            if (recordGeneratorType == PaddingRecordGeneratorType.VERY_SHORT) {
+                recordGeneratorType = PaddingRecordGeneratorType.SHORT;
+            }
             for (ProtocolVersion version : versionList) {
 
                 VersionSuiteListPair suitePairList = null;