Merge pull request #13 from RUB-NDS/TestSuite

Test suite

Author: jurajsomorovsky

Attacks/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>1.0</version>
+        <version>1.1</version>
     </parent>
     <artifactId>Attacks</artifactId>
     <packaging>jar</packaging>

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/InvalidCurveAttackCommandConfig.java

@@ -35,8 +35,8 @@ public class InvalidCurveAttackCommandConfig extends ClientCommandConfig {
 
     public InvalidCurveAttackCommandConfig() {
 	cipherSuites.clear();
-	cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
-	cipherSuites.add(CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA);
+	cipherSuites.add(CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+	cipherSuites.add(CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
 	namedCurves.clear();
 	namedCurves.add(NamedCurve.SECP256R1);
 	workflowTraceType = WorkflowTraceType.HANDSHAKE;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/InvalidCurveAttackFullCommandConfig.java

@@ -31,8 +31,8 @@ public class InvalidCurveAttackFullCommandConfig extends ClientCommandConfig {
 
     public InvalidCurveAttackFullCommandConfig() {
 	cipherSuites.clear();
-	cipherSuites.add(CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
 	cipherSuites.add(CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA);
+	cipherSuites.add(CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA);
 	namedCurves.clear();
 	namedCurves.add(NamedCurve.SECP256R1);
 	workflowTraceType = WorkflowTraceType.HANDSHAKE;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/mitm/MitMWorkflowExecutor.java

@@ -108,7 +108,7 @@ public void executeWorkflow() throws WorkflowExecutionException {
 	    while (clientWorkflowContext.getProtocolMessagePointer() < protocolMessages.size()
 		    && clientWorkflowContext.isProceedWorkflow()) {
 		ProtocolMessage pm = protocolMessages.get(clientWorkflowContext.getProtocolMessagePointer());
-		if (pm.isOnlyForward()) {
+		if (!pm.isGoingToBeParsed()) {
 		    forwardMessage(pm);
 		} else {
 		    if (pm.getMessageIssuer() == ConnectionEnd.CLIENT) {
@@ -212,7 +212,7 @@ protected void prepareMyProtocolMessageBytes(ProtocolMessage pm) {
 	}
 
 	// if message needs to be modified manually
-	if ((pm.isModify() || modify) && !ccs) {
+	if ((pm.isGoingToBeModified() || modify) && !ccs) {
 	    javax.swing.JFrame frame = new javax.swing.JFrame();
 	    MitM_Dialog dialog = new MitM_Dialog(frame, true, pm, tlsContext.getMyConnectionEnd().toString());
 	    dialog.setVisible(true);

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/mitm/RSAExampleMitMWorkflowConfiguration.java

@@ -144,7 +144,7 @@ private WorkflowTrace createFullSRWorkflow() {
 
 	ApplicationMessage sam = new ApplicationMessage(ConnectionEnd.SERVER);
 	protocolMessages.add(sam);
-	sam.setModify(true);
+	sam.setGoingToBeModified(true);
 
 	workflowTrace.setProtocolMessages(protocolMessages);
 

EAP/pom.xml

@@ -18,15 +18,15 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>1.0</version>
+        <version>1.1</version>
     </parent>
     <artifactId>EAP</artifactId>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>ModifiableVariable</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.jnetpcap</groupId>

Fuzzer/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>1.0</version>
+        <version>1.1</version>
     </parent>
     <artifactId>TLS-Fuzzer</artifactId>
     <packaging>jar</packaging>

Fuzzer/src/main/java/de/rub/nds/tlsattacker/fuzzer/impl/SimpleFuzzer.java

@@ -137,7 +137,7 @@ private void gatherWorkflowsAndCertificate() {
 	for (File file : xmlFiles) {
 	    try {
 		LOGGER.log(LogLevel.CONSOLE_OUTPUT, "Executing the TLS workflow according to {}", file.getPath());
-		fuzzerConfig.setWorkflowTraceConfigFile(file.getAbsolutePath());
+		fuzzerConfig.setWorkflowInput(file.getAbsolutePath());
 		TransportHandler transportHandler = configHandler.initializeTransportHandler(fuzzerConfig);
 		TlsContext tlsContext = configHandler.initializeTlsContext(fuzzerConfig);
 		WorkflowTrace tmpTrace = (WorkflowTrace) UnoptimizedDeepCopy.copy(tlsContext.getWorkflowTrace());

ModifiableVariable/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>1.0</version>
+        <version>1.1</version>
     </parent>
     <artifactId>ModifiableVariable</artifactId>
     <packaging>jar</packaging>

ModifiableVariable/src/main/java/de/rub/nds/tlsattacker/modifiablevariable/ModifiableVariable.java

@@ -31,11 +31,10 @@ public abstract class ModifiableVariable<E> {
 
     private VariableModification<E> modification = null;
 
-    /**
-     *
-     */
     private boolean createRandomModification;
 
+    protected E assertEquals;
+
     public ModifiableVariable() {
 
     }
@@ -68,4 +67,10 @@ public void createRandomModificationAtRuntime() {
     }
 
     public abstract boolean isOriginalValueModified();
+
+    public abstract boolean validateAssertions();
+
+    public boolean containsAssertion() {
+	return (assertEquals != null);
+    }
 }