stash for work

Author: ic0ns

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/PaddingOracleProbe.java

@@ -33,6 +33,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -113,6 +115,11 @@ public ProbeResult executeTest() {
                         versionDelegate.setProtocolVersion(version);
                         paddingOracleConfig.setRecordGeneratorType(recordGeneratorType);
                         paddingOracleConfig.setVectorGeneratorType(vectorType);
+                        try {
+                            Thread.currentThread().sleep(10000);
+                        } catch (InterruptedException ex) {
+                            Logger.getLogger(PaddingOracleProbe.class.getName()).log(Level.SEVERE, null, ex);
+                        }
                         PaddingOracleAttacker attacker = new PaddingOracleAttacker(paddingOracleConfig, scannerConfig.createConfig(), getParallelExecutor());
                         boolean hasError = false;
                         try {

src/main/resources/log4j2.xml

@@ -10,7 +10,7 @@
         <Console name="Direct" target="SYSTEM_OUT">
             <PatternLayout pattern="%highlight{%msg}%n"/>
         </Console>
-        <File name="File" fileName="log/info.log" immediateFlush="false" append="true">
+        <File name="File" fileName="log/info.log" immediateFlush="true" append="true">
             <PatternLayout pattern="%highlight{%d{HH:mm:ss}{GMT+0} [%t] %-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
         </File>    
         <Routing name="Routing">
@@ -25,7 +25,7 @@
 
                 <!-- This route is chosen if ThreadContext has no value for key ROUTINGKEY. -->
                 <Route key="$${ctx:ROUTINGKEY}">
-                    <File name="FileOnDebug" fileName="log/info.log" immediateFlush="false" append="true">
+                    <File name="FileOnDebug" fileName="log/info.log" immediateFlush="true" append="true">
                         <PatternLayout pattern="%highlight{%d{HH:mm:ss}{GMT+0} [%t] %-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
                     </File>
                 </Route>
@@ -37,7 +37,9 @@
         <Logger name="ConsoleLogger" level="INFO" additivity="false">
             <AppenderRef ref="Direct"/>
         </Logger> 
-        
+        <Logger name="DirectLogger" level="warn"/>
+        <Logger name="de.rub.nds.tlsscanner.probe.TlsProbe" level="WARN"/>
+        <Logger name="de.rub.nds.tlsscanner.SingleThreadedScanJobExecutor" level="WARN"/>
         <Logger name="de.rub.nds.tlsattacker.core.protocol.handler" level="ERROR"/>
         <Logger name="de.rub.nds.tlsattacker.core.protocol.message" level="ERROR"/>
         <Logger name="de.rub.nds.tlsattacker.core.protocol.parser" level="ERROR"/>
@@ -58,7 +60,7 @@
         <Logger name="de.rub.nds.tlsattacker" level="ERROR"/>
         <Logger name="de.rub.nds.modifiablevariable" level="ERROR"/>
 
-        <Root level="INFO">
+        <Root level="ERROR">
             <AppenderRef ref="Routing"/>
         </Root>
     </Loggers>