Merge branch 'bbrework' of https://github.com/RUB-NDS/TLS-Scanner into bbrework

Author: ic0ns

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

@@ -170,7 +170,7 @@ private void checkProbesDone(List<Future<ProbeResult>> futureResults, ProgressBa
         boolean isNotReady = true;
         int done = 0;
         int tempDone = 0;
-        while (isNotReady) {
+        while (isNotReady && futureResults.size() > 0) {
             tempDone = 0;
             for (Future<ProbeResult> probeResult : futureResults) {
                 if (probeResult.isDone()) {

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

@@ -133,7 +133,7 @@ private void fillDefaultProbeLists() {
         phaseTwoTestList.add(new RenegotiationProbe(config, parallelExecutor));
         phaseTwoTestList.add(new HeartbleedProbe(config, parallelExecutor));
         phaseTwoTestList.add(new PaddingOracleProbe(config, parallelExecutor));
-        //phaseTwoTestList.add(new BleichenbacherProbe(config, parallelExecutor));
+        phaseTwoTestList.add(new BleichenbacherProbe(config, parallelExecutor));
         phaseTwoTestList.add(new PoodleProbe(config, parallelExecutor));
         phaseTwoTestList.add(new TlsPoodleProbe(config, parallelExecutor));
         phaseTwoTestList.add(new Cve20162107Probe(config, parallelExecutor));

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

@@ -54,10 +54,14 @@ public ProbeResult executeTest() {
 
     @Override
     public boolean shouldBeExecuted(SiteReport report) {
-        for (ExtensionType type : report.getSupportedExtensions()) {
-            if (type == ExtensionType.HEARTBEAT) {
-                return true;
+        if (report.getSupportedExtensions() != null) {
+            for (ExtensionType type : report.getSupportedExtensions()) {
+                if (type == ExtensionType.HEARTBEAT) {
+                    return true;
+                }
             }
+        } else {
+            return true;
         }
         return false;
     }