merged

Author: ic0ns

.gitignore

@@ -1,51 +1,24 @@
-*.iml
+resources/*.pem
+test.sh
+
+# (build) artifacts
+apps/
 target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-/apps/
+
+# Eclipse
+**/.classpath
+**/.project
+**/.settings/
+.project
+
+# Netbeans
 nbproject/
 nbactions.xml.project
-.settings/
-Attacks/.classpath
-Attacks/.project
-Attacks/.settings/org.eclipse.core.resources.prefs
-Attacks/.settings/org.eclipse.jdt.core.prefs
-TLS-Client/.classpath
-TLS-Client/.project
-TLS-Client/.settings/org.eclipse.core.resources.prefs
-TLS-Client/.settings/org.eclipse.jdt.core.prefs
-TLS-Core/.classpath
-TLS-Core/.project
-TLS-Core/.settings/org.eclipse.core.resources.prefs
-TLS-Core/.settings/org.eclipse.jdt.core.prefs
-TLS-Forensics/.classpath
-TLS-Forensics/.project
-TLS-Forensics/.settings/
-TLS-Mitm/.classpath
-TLS-Mitm/.project
-TLS-Mitm/.settings/org.eclipse.core.resources.prefs
-TLS-Mitm/.settings/org.eclipse.jdt.core.prefs
-TLS-Server/.classpath
-TLS-Server/.project
-TLS-Server/.settings/org.eclipse.core.resources.prefs
-TLS-Server/.settings/org.eclipse.jdt.core.prefs
-TraceTool/.classpath
-TraceTool/.project
-TraceTool/.settings/org.eclipse.core.resources.prefs
-TraceTool/.settings/org.eclipse.jdt.core.prefs
-Transport/.classpath
-Transport/.project
-Transport/.settings/org.eclipse.core.resources.prefs
-Transport/.settings/org.eclipse.jdt.core.prefs
-Utils/.classpath
-Utils/.project
-Utils/.settings/org.eclipse.core.resources.prefs
-Utils/.settings/org.eclipse.jdt.core.prefs
-resources/*.pem
-.project
-test.sh
-.classpath
-.idea
+
+# IntelliJ
+.idea/
+*.iml
+
+# Maven
+pom.xml.*
+release.properties

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/actions/EarlyCcsAction.java

@@ -18,6 +18,7 @@
 import de.rub.nds.tlsattacker.core.record.Record;
 import de.rub.nds.tlsattacker.core.state.State;
 import de.rub.nds.tlsattacker.core.workflow.action.TlsAction;
+import de.rub.nds.tlsattacker.core.workflow.action.executor.SendMessageHelper;
 import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowConfigurationFactory;
 import java.io.IOException;
 import java.util.LinkedList;
@@ -65,7 +66,7 @@ public void execute(State state) {
         }
         message.setAdjustContext(Modifiable.explicit(false));
         ClientKeyExchangeHandler handler = (ClientKeyExchangeHandler) message.getHandler(state.getTlsContext());
-        byte[] protocolMessageBytes = handler.prepareMessage(message);
+        byte[] protocolMessageBytes = SendMessageHelper.prepareMessage(message, state.getTlsContext());
         if (targetOpenssl100) {
             handler.adjustPremasterSecret(message);
             handler.adjustMasterSecret(message);

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

@@ -143,5 +143,4 @@ public Config createConfig() {
         }
         return config;
     }
-
 }

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

@@ -104,5 +104,4 @@ public Config createConfig() {
         config.setAddEllipticCurveExtension(containsEc);
         return config;
     }
-
 }

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

@@ -108,5 +108,4 @@ public Config createConfig() {
         config.setAddEllipticCurveExtension(containsEc);
         return config;
     }
-
 }

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/connectivity/ConnectivityChecker.java

@@ -12,7 +12,7 @@
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.connection.AliasedConnection;
 import de.rub.nds.tlsattacker.core.constants.RunningModeType;
-import de.rub.nds.tlsattacker.core.protocol.message.ProtocolMessage;
+import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.SSL2ServerHelloMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.ServerHelloDoneMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.ServerHelloMessage;

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

@@ -25,7 +25,8 @@
 import de.rub.nds.tlsattacker.core.constants.RunningModeType;
 import de.rub.nds.tlsattacker.core.exceptions.WorkflowExecutionException;
 import de.rub.nds.tlsattacker.core.protocol.message.AlertMessage;
-import de.rub.nds.tlsattacker.core.protocol.message.ProtocolMessage;
+import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage;
+import de.rub.nds.tlsattacker.core.protocol.message.TlsMessage;
 import de.rub.nds.tlsattacker.core.record.AbstractRecord;
 import de.rub.nds.tlsattacker.core.record.Record;
 import de.rub.nds.tlsattacker.core.state.State;
@@ -130,17 +131,25 @@ private Boolean executeAttackRound(ProtocolVersion version, CipherSuite suite) {
         }
         ProtocolMessage lm = WorkflowTraceUtil.getLastReceivedMessage(trace);
         lastMessages.add(lm);
-        if (lm.getProtocolMessageType() == ProtocolMessageType.ALERT) {
+
+        if (!(lm instanceof TlsMessage)) {
+            LOGGER.warn("  Last message was not a TLS message. Received {}", lm.getClass().getName());
+            return false;
+        }
+
+        TlsMessage tlsMessage = (TlsMessage) lm;
+
+        if (tlsMessage.getProtocolMessageType() == ProtocolMessageType.ALERT) {
             AlertMessage am = ((AlertMessage) lm);
             LOGGER.info("  Last protocol message: Alert ({},{}) [{},{}]",
                 AlertLevel.getAlertLevel(am.getLevel().getValue()),
                 AlertDescription.getAlertDescription(am.getDescription().getValue()), am.getLevel().getValue(),
                 am.getDescription().getValue());
         } else {
-            LOGGER.info("  Last protocol message: {}", lm.getProtocolMessageType());
+            LOGGER.info("  Last protocol message: {}", tlsMessage.getProtocolMessageType());
         }
 
-        if (lm.getProtocolMessageType() == ProtocolMessageType.ALERT
+        if (tlsMessage.getProtocolMessageType() == ProtocolMessageType.ALERT
             && AlertDescription.getAlertDescription(((AlertMessage) lm).getDescription().getValue())
                 == AlertDescription.RECORD_OVERFLOW) {
             LOGGER.info("  Vulnerable");

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

@@ -21,7 +21,7 @@
 import de.rub.nds.tlsattacker.core.protocol.message.ChangeCipherSpecMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.ClientHelloMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.FinishedMessage;
-import de.rub.nds.tlsattacker.core.protocol.message.ProtocolMessage;
+import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.ServerHelloDoneMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.ServerHelloMessage;
 import de.rub.nds.tlsattacker.core.state.State;

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

@@ -17,7 +17,7 @@
 import de.rub.nds.tlsattacker.core.constants.ProtocolMessageType;
 import de.rub.nds.tlsattacker.core.protocol.message.ChangeCipherSpecMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.FinishedMessage;
-import de.rub.nds.tlsattacker.core.protocol.message.ProtocolMessage;
+import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage;
 import de.rub.nds.tlsattacker.core.state.State;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutor;
 import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutorFactory;

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

@@ -378,7 +378,7 @@ private Boolean evaluateExecutedTasks(List<TlsTask> taskList) {
             if (!task.isHasError()) {
                 foundExecutedAsPlanned = true;
                 if (!(WorkflowTraceUtil.getLastReceivedMessage(trace) != null
-                    && WorkflowTraceUtil.getLastReceivedMessage(trace).isHandshakeMessage()
+                    && WorkflowTraceUtil.getLastReceivedMessage(trace) instanceof HandshakeMessage
                     && ((HandshakeMessage) WorkflowTraceUtil.getLastReceivedMessage(trace)).getHandshakeMessageType()
                         == HandshakeMessageType.FINISHED)) {
                     LOGGER.info("Received no finished Message using secret" + task.getAppliedSecret());