fix wrong use of WorkflowTraceUtil in two probes (#468)

Author: Conradowatz

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/MacProbe.java

@@ -34,6 +34,7 @@
 import de.rub.nds.tlsattacker.core.state.State;
 import de.rub.nds.tlsattacker.core.workflow.ParallelExecutor;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowTrace;
+import de.rub.nds.tlsattacker.core.workflow.WorkflowTraceConfigurationUtil;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowTraceResultUtil;
 import de.rub.nds.tlsattacker.core.workflow.action.GenericReceiveAction;
 import de.rub.nds.tlsattacker.core.workflow.action.ReceiveAction;
@@ -228,7 +229,7 @@ private WorkflowTrace getVerifyDataTrace(Config config, int xorPosition) {
                                 WorkflowTraceType.DYNAMIC_HANDSHAKE, RunningModeType.CLIENT);
         FinishedMessage lastSendMessage =
                 (FinishedMessage)
-                        WorkflowTraceResultUtil.getLastSentMessage(
+                        WorkflowTraceConfigurationUtil.getLastStaticConfiguredSendMessage(
                                 trace, HandshakeMessageType.FINISHED);
         lastSendMessage.setVerifyData(Modifiable.xor(new byte[] {01}, xorPosition));
         return trace;

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/invalidcurve/trace/InvalidCurveWorkflowGenerator.java

@@ -21,7 +21,7 @@
 import de.rub.nds.tlsattacker.core.protocol.message.extension.ExtensionMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.extension.KeyShareExtensionMessage;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowTrace;
-import de.rub.nds.tlsattacker.core.workflow.WorkflowTraceResultUtil;
+import de.rub.nds.tlsattacker.core.workflow.WorkflowTraceConfigurationUtil;
 import de.rub.nds.tlsattacker.core.workflow.action.ChangeDefaultPreMasterSecretAction;
 import de.rub.nds.tlsattacker.core.workflow.action.GenericReceiveAction;
 import de.rub.nds.tlsattacker.core.workflow.action.ReceiveAction;
@@ -72,7 +72,7 @@ private static WorkflowTrace prepareRegularTrace(
 
             ClientHelloMessage clientHello =
                     (ClientHelloMessage)
-                            WorkflowTraceResultUtil.getFirstSentMessage(
+                            WorkflowTraceConfigurationUtil.getFirstStaticConfiguredSendMessage(
                                     trace, HandshakeMessageType.CLIENT_HELLO);
             KeyShareExtensionMessage ksExt;
             for (ExtensionMessage ext : clientHello.getExtensions()) {
@@ -96,7 +96,7 @@ private static WorkflowTrace prepareRegularTrace(
 
             ECDHClientKeyExchangeMessage message =
                     (ECDHClientKeyExchangeMessage)
-                            WorkflowTraceResultUtil.getFirstSentMessage(
+                            WorkflowTraceConfigurationUtil.getFirstStaticConfiguredSendMessage(
                                     trace, HandshakeMessageType.CLIENT_KEY_EXCHANGE);
             message.setPublicKey(serializedPublicKey);
             message.prepareComputations();
@@ -155,7 +155,7 @@ private static WorkflowTrace prepareRenegotiationTrace(
                                     RunningModeType.CLIENT);
             ECDHClientKeyExchangeMessage message =
                     (ECDHClientKeyExchangeMessage)
-                            WorkflowTraceResultUtil.getLastSentMessage(
+                            WorkflowTraceConfigurationUtil.getLastStaticConfiguredSendMessage(
                                     trace, HandshakeMessageType.CLIENT_KEY_EXCHANGE);
             message.setPublicKey(serializedPublicKey);
             message.prepareComputations();