Merge pull request #730 from tls-attacker/fix-schema-generation

fix schema generation for missing classes

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/TlsContext.java

@@ -69,17 +69,21 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlTransient;
 
 import de.rub.nds.tlsattacker.transport.socket.SocketState;
 import de.rub.nds.tlsattacker.transport.tcp.ClientTcpTransportHandler;
 import org.bouncycastle.crypto.tls.Certificate;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 public class TlsContext {
 
     /**
      * TLS-Attacker related configurations.
      */
+    @XmlTransient
     private Config config;
 
     private List<Session> sessionList;

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

@@ -39,6 +39,7 @@
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.xml.sax.SAXException;

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

@@ -19,6 +19,8 @@
 import java.util.Objects;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -32,6 +34,7 @@
  * @param <T>
  *            Object type of the field inside the {@link TlsContext}
  */
+@XmlSeeAlso(TlsContext.class)
 public class ChangeContextValueAction<T> extends ConnectionBoundAction {
 
     private static final Logger LOGGER = LogManager.getLogger();

TLS-Core/src/main/resources/workflowTrace.xsd

@@ -1,6 +1,6 @@
 # Given this config:
 <config>
-    <defaulRunningMode>CLIENT</defaulRunningMode>
+    <defaultRunningMode>CLIENT</defaultRunningMode>
     <defaultClientConnection>
         <alias>client</alias>
         <port>443</port>

TLS-Core/src/test/resources/workflow_trace_serialization_tests-positive/test_workflow_trace_handling-positive-2.xml

@@ -2,7 +2,7 @@ Test a MITM workflow trace
 
 # Given this config:
 <config>
-    <runningMode>MITM</runningMode>
+    <defaultRunningMode>MITM</defaultRunningMode>
 </config>
 
 # And this input trace