Merge origin/master into docker_it_remove

Conflicts: TLS-Mitm/src/test/resources/mitm_stdout_help.txt
tls-attacker · Apr 10, 2018 · 4ec7fce · 4ec7fce
2 parents 834418c + a6676c0
commit 4ec7fce
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 111 deletions.
diff --git a/.../main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java b/.../main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java
@@ -96,8 +96,10 @@ public WorkflowTrace createWorkflowTrace(WorkflowTraceType type, RunningModeType
                 return createShortHelloWorkflow();
             case SSL2_HELLO:
                 return createSsl2HelloWorkflow();
-            case CLIENT_RENEGOTIATION:
+            case CLIENT_RENEGOTIATION_WITHOUT_RESUMPTION:
                 return createClientRenegotiationWorkflow();
+            case CLIENT_RENEGOTIATION:
+                return createClientRenegotiationWithResumptionWorkflow();
             case SERVER_RENEGOTIATION:
                 return createServerRenegotiationWorkflow();
             case HTTPS:
@@ -391,6 +393,17 @@ private WorkflowTrace createResumptionWorkflow() {
         return trace;
     }
 
+    private WorkflowTrace createClientRenegotiationWithResumptionWorkflow() {
+        AliasedConnection conEnd = getConnection();
+        WorkflowTrace trace = createHandshakeWorkflow(conEnd);
+        trace.addTlsAction(new RenegotiationAction());
+        WorkflowTrace renegotiationTrace = createResumptionWorkflow();
+        for (TlsAction reneAction : renegotiationTrace.getTlsActions()) {
+            trace.addTlsAction(reneAction);
+        }
+        return trace;
+    }
+
     private WorkflowTrace createClientRenegotiationWorkflow() {
         AliasedConnection conEnd = getConnection();
         WorkflowTrace trace = createHandshakeWorkflow(conEnd);

diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowTraceType.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowTraceType.java
@@ -15,6 +15,7 @@ public enum WorkflowTraceType {
     SHORT_HELLO,
     RESUMPTION,
     FULL_RESUMPTION,
+    CLIENT_RENEGOTIATION_WITHOUT_RESUMPTION,
     CLIENT_RENEGOTIATION,
     SERVER_RENEGOTIATION,
     HTTPS,

diff --git a/TLS-Mitm/src/test/java/de/rub/nds/tlsattacker/mitm/main/TlsMitmCommonUsageTest.java b/TLS-Mitm/src/test/java/de/rub/nds/tlsattacker/mitm/main/TlsMitmCommonUsageTest.java
diff --git a/TLS-Mitm/src/test/resources/mitm_stdout_help.txt b/TLS-Mitm/src/test/resources/mitm_stdout_help.txt