Fixed quick mode in padding oracle and bleichenbacher

Author: ic0ns

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;