Wip

Author: ic0ns

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PaddingOracleAttacker.java

@@ -220,8 +220,8 @@ public List<VectorResponse> createVectorResponseList() {
         for (PaddingVector vector : vectorGenerator.getVectors(tlsConfig.getDefaultSelectedCipherSuite(),
                 tlsConfig.getDefaultHighestClientProtocolVersion())) {
             State state = new State(tlsConfig, generator.getPaddingOracleWorkflowTrace(tlsConfig, vector));
-            FingerPrintTask fingerPrintTask = new FingerPrintTask(state, additionalTimeout, increasingTimeout, 6,
-                    additionalTcpTimeout);
+            FingerPrintTask fingerPrintTask = new FingerPrintTask(state, additionalTimeout, increasingTimeout,
+                    executor.getReexecutions(), additionalTcpTimeout);
             taskList.add(fingerPrintTask);
             stateVectorPairList.add(new FingerprintTaskVectorPair(fingerPrintTask, vector));
         }

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateMessageHandler.java

@@ -12,7 +12,6 @@
 import de.rub.nds.tlsattacker.core.certificate.CertificateKeyPair;
 import de.rub.nds.tlsattacker.core.constants.HandshakeByteLength;
 import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
-import de.rub.nds.tlsattacker.core.crypto.keys.CustomPublicKey;
 import de.rub.nds.tlsattacker.core.exceptions.AdjustmentException;
 import de.rub.nds.tlsattacker.core.protocol.handler.extension.ExtensionHandler;
 import de.rub.nds.tlsattacker.core.protocol.handler.factory.HandlerFactory;
@@ -25,7 +24,6 @@
 import de.rub.nds.tlsattacker.core.protocol.preparator.CertificateMessagePreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.CertificateMessageSerializer;
 import de.rub.nds.tlsattacker.core.state.TlsContext;
-import de.rub.nds.tlsattacker.core.util.CertificateUtils;
 import de.rub.nds.tlsattacker.transport.ConnectionEndType;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/CertificateMessage.java

@@ -62,7 +62,6 @@ public class CertificateMessage extends HandshakeMessage {
 
     public CertificateMessage() {
         super(HandshakeMessageType.CERTIFICATE);
-        certificatesList = new LinkedList<>();
     }
 
     public CertificateMessage(Config tlsConfig) {

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/DefaultWorkflowExecutor.java

@@ -64,11 +64,11 @@ public void executeWorkflow() throws WorkflowExecutionException {
                 break;
             }
             if ((state.getConfig().isStopActionsAfterFatal() && isReceivedFatalAlert())) {
-                LOGGER.trace("Skipping all Actions, received FatalAlert, StopActionsAfterFatal active");
+                LOGGER.debug("Skipping all Actions, received FatalAlert, StopActionsAfterFatal active");
                 break;
             }
             if ((state.getConfig().getStopActionsAfterIOException() && isIoException())) {
-                LOGGER.trace("Skipping all Actions, received IO Exception, StopActionsAfterIOException active");
+                LOGGER.debug("Skipping all Actions, received IO Exception, StopActionsAfterIOException active");
                 break;
             }
 

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/ParallelExecutor.java

@@ -113,4 +113,8 @@ public int getSize() {
     public void shutdown() {
         executorService.shutdown();
     }
+
+    public int getReexecutions() {
+        return reexecutions;
+    }
 }

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/task/TlsTask.java

@@ -71,6 +71,7 @@ public ITask call() {
                 }
                 exception = E;
             }
+            this.reset();
         }
         if (hasError) {
             LOGGER.error("Could not execute Workflow.", exception);