Wrong Parser Version (#901)

ic0ns · web-flow · commit b22b13fba5ab · 2022-06-08T17:00:50.000+02:00
* removed unnecessary import

* changed sematics of a 'merge' for message results

* fixed using wrong version in parsers
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/AlertHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/AlertHandler.java
@@ -28,7 +28,7 @@ public AlertHandler(TlsContext tlsContext) {
 
     @Override
     public AlertParser getParser(byte[] message, int pointer) {
-        return new AlertParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new AlertParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ApplicationMessageHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ApplicationMessageHandler.java
@@ -28,7 +28,7 @@ public ApplicationMessageHandler(TlsContext tlsContext) {
 
     @Override
     public ApplicationMessageParser getParser(byte[] message, int pointer) {
-        return new ApplicationMessageParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new ApplicationMessageParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateRequestHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateRequestHandler.java
@@ -36,7 +36,7 @@ public CertificateRequestHandler(TlsContext tlsContext) {
 
     @Override
     public CertificateRequestParser getParser(byte[] message, int pointer) {
-        return new CertificateRequestParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new CertificateRequestParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateStatusHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateStatusHandler.java
@@ -22,7 +22,7 @@ public CertificateStatusHandler(TlsContext tlsContext) {
 
     @Override
     public CertificateStatusParser getParser(byte[] message, int pointer) {
-        return new CertificateStatusParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new CertificateStatusParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateVerifyHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateVerifyHandler.java
@@ -34,7 +34,7 @@ public CertificateVerifyHandler(TlsContext tlsContext) {
 
     @Override
     public CertificateVerifyParser getParser(byte[] message, int pointer) {
-        return new CertificateVerifyParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new CertificateVerifyParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ChangeCipherSpecHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ChangeCipherSpecHandler.java
@@ -36,7 +36,7 @@ public ChangeCipherSpecHandler(TlsContext tlsContext) {
 
     @Override
     public ChangeCipherSpecParser getParser(byte[] message, int pointer) {
-        return new ChangeCipherSpecParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new ChangeCipherSpecParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ClientHelloHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ClientHelloHandler.java
@@ -26,7 +26,6 @@
 import de.rub.nds.tlsattacker.core.protocol.parser.ClientHelloParser;
 import de.rub.nds.tlsattacker.core.protocol.preparator.ClientHelloPreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.ClientHelloSerializer;
-import de.rub.nds.tlsattacker.core.record.cipher.RecordCipher;
 import de.rub.nds.tlsattacker.core.record.cipher.RecordCipherFactory;
 import de.rub.nds.tlsattacker.core.record.cipher.cryptohelper.KeySet;
 import de.rub.nds.tlsattacker.core.record.cipher.cryptohelper.KeySetGenerator;
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/DHEServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/DHEServerKeyExchangeHandler.java
@@ -32,7 +32,7 @@ public DHEServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public DHEServerKeyExchangeParser<T> getParser(byte[] message, int pointer) {
-        return new DHEServerKeyExchangeParser<T>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new DHEServerKeyExchangeParser<T>(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             AlgorithmResolver.getKeyExchangeAlgorithm(tlsContext.getChooser().getSelectedCipherSuite()),
             tlsContext.getConfig());
     }
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ECDHClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ECDHClientKeyExchangeHandler.java
@@ -30,7 +30,7 @@ public ECDHClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public ECDHClientKeyExchangeParser<T> getParser(byte[] message, int pointer) {
-        return new ECDHClientKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new ECDHClientKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ECDHEServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ECDHEServerKeyExchangeHandler.java
@@ -11,17 +11,13 @@
 
 import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
 import de.rub.nds.tlsattacker.core.constants.NamedGroup;
-import de.rub.nds.tlsattacker.core.crypto.ec.CurveFactory;
-import de.rub.nds.tlsattacker.core.crypto.ec.EllipticCurve;
-import de.rub.nds.tlsattacker.core.crypto.ec.FieldElementF2m;
 import de.rub.nds.tlsattacker.core.crypto.ec.Point;
 import de.rub.nds.tlsattacker.core.crypto.ec.PointFormatter;
 import de.rub.nds.tlsattacker.core.protocol.message.ECDHEServerKeyExchangeMessage;
 import de.rub.nds.tlsattacker.core.protocol.parser.ECDHEServerKeyExchangeParser;
 import de.rub.nds.tlsattacker.core.protocol.preparator.ECDHEServerKeyExchangePreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.ECDHEServerKeyExchangeSerializer;
 import de.rub.nds.tlsattacker.core.state.TlsContext;
-import java.math.BigInteger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -36,7 +32,8 @@ public ECDHEServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public ECDHEServerKeyExchangeParser<T> getParser(byte[] message, int pointer) {
-        return new ECDHEServerKeyExchangeParser<T>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new ECDHEServerKeyExchangeParser<>(pointer, message,
+            tlsContext.getChooser().getSelectedProtocolVersion(),
             AlgorithmResolver.getKeyExchangeAlgorithm(tlsContext.getChooser().getSelectedCipherSuite()),
             tlsContext.getConfig());
     }
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/EmptyClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/EmptyClientKeyExchangeHandler.java
@@ -26,7 +26,7 @@ public EmptyClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public EmptyClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new EmptyClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new EmptyClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/FinishedHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/FinishedHandler.java
@@ -20,7 +20,6 @@
 import de.rub.nds.tlsattacker.core.protocol.parser.FinishedParser;
 import de.rub.nds.tlsattacker.core.protocol.preparator.FinishedPreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.FinishedSerializer;
-import de.rub.nds.tlsattacker.core.record.cipher.RecordCipher;
 import de.rub.nds.tlsattacker.core.record.cipher.RecordCipherFactory;
 import de.rub.nds.tlsattacker.core.record.cipher.cryptohelper.KeySet;
 import de.rub.nds.tlsattacker.core.record.cipher.cryptohelper.KeySetGenerator;
@@ -42,7 +41,7 @@ public FinishedHandler(TlsContext context) {
 
     @Override
     public FinishedParser getParser(byte[] message, int pointer) {
-        return new FinishedParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new FinishedParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/GOSTClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/GOSTClientKeyExchangeHandler.java
@@ -28,7 +28,7 @@ public GOSTClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public GOSTClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new GOSTClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new GOSTClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HandshakeMessageHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HandshakeMessageHandler.java
@@ -34,6 +34,7 @@ public HandshakeMessageHandler(TlsContext tlsContext) {
     }
 
     protected void adjustExtensions(HandshakeMessageT message) {
+        LOGGER.debug("Adjusting context for extensions");
         if (message.getExtensions() != null) {
             for (ExtensionMessage extension : message.getExtensions()) {
                 ExtensionHandler handler =
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HeartbeatMessageHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HeartbeatMessageHandler.java
@@ -26,7 +26,7 @@ public HeartbeatMessageHandler(TlsContext tlsContext) {
 
     @Override
     public HeartbeatMessageParser getParser(byte[] message, int pointer) {
-        return new HeartbeatMessageParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new HeartbeatMessageParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HelloRequestHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HelloRequestHandler.java
@@ -23,7 +23,7 @@ public HelloRequestHandler(TlsContext tlsContext) {
 
     @Override
     public HelloRequestParser getParser(byte[] message, int pointer) {
-        return new HelloRequestParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new HelloRequestParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HelloVerifyRequestHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/HelloVerifyRequestHandler.java
@@ -28,7 +28,7 @@ public HelloVerifyRequestHandler(TlsContext tlsContext) {
 
     @Override
     public HelloVerifyRequestParser getParser(byte[] message, int pointer) {
-        return new HelloVerifyRequestParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new HelloVerifyRequestParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PWDClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PWDClientKeyExchangeHandler.java
@@ -23,7 +23,7 @@ public PWDClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PWDClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PWDClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PWDClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             AlgorithmResolver.getKeyExchangeAlgorithm(tlsContext.getChooser().getSelectedCipherSuite()),
             tlsContext.getConfig());
     }
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PWDServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PWDServerKeyExchangeHandler.java
@@ -26,7 +26,7 @@ public PWDServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PWDServerKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PWDServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PWDServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             AlgorithmResolver.getKeyExchangeAlgorithm(tlsContext.getChooser().getSelectedCipherSuite()),
             tlsContext.getConfig());
     }
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskClientKeyExchangeHandler.java
@@ -23,7 +23,7 @@ public PskClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PskClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskDhClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskDhClientKeyExchangeHandler.java
@@ -23,7 +23,7 @@ public PskDhClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskDhClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskDhClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PskDhClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskDheServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskDheServerKeyExchangeHandler.java
@@ -28,7 +28,7 @@ public PskDheServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskDheServerKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskDheServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PskDheServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskEcDhClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskEcDhClientKeyExchangeHandler.java
@@ -23,8 +23,8 @@ public PskEcDhClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskEcDhClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskEcDhClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
-            tlsContext.getConfig());
+        return new PskEcDhClientKeyExchangeParser(pointer, message,
+            tlsContext.getChooser().getSelectedProtocolVersion(), tlsContext.getConfig());
     }
 
     @Override
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskEcDheServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskEcDheServerKeyExchangeHandler.java
@@ -23,8 +23,8 @@ public PskEcDheServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskEcDheServerKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskEcDheServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
-            tlsContext.getConfig());
+        return new PskEcDheServerKeyExchangeParser(pointer, message,
+            tlsContext.getChooser().getSelectedProtocolVersion(), tlsContext.getConfig());
     }
 
     @Override
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskRsaClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskRsaClientKeyExchangeHandler.java
@@ -23,7 +23,7 @@ public PskRsaClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskRsaClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskRsaClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PskRsaClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/PskServerKeyExchangeHandler.java
@@ -23,7 +23,7 @@ public PskServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public PskServerKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new PskServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new PskServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/RSAClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/RSAClientKeyExchangeHandler.java
@@ -23,7 +23,7 @@ public RSAClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public RSAClientKeyExchangeParser<T> getParser(byte[] message, int pointer) {
-        return new RSAClientKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new RSAClientKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/RSAServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/RSAServerKeyExchangeHandler.java
@@ -11,7 +11,6 @@
 
 import java.math.BigInteger;
 
-import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
 import de.rub.nds.tlsattacker.core.protocol.message.RSAServerKeyExchangeMessage;
 import de.rub.nds.tlsattacker.core.protocol.parser.HandshakeMessageParser;
 import de.rub.nds.tlsattacker.core.protocol.parser.RSAServerKeyExchangeParser;
@@ -29,7 +28,7 @@ public RSAServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public HandshakeMessageParser<RSAServerKeyExchangeMessage> getParser(byte[] message, int pointer) {
-        return new RSAServerKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new RSAServerKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ServerHelloDoneHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ServerHelloDoneHandler.java
@@ -23,7 +23,7 @@ public ServerHelloDoneHandler(TlsContext tlsContext) {
 
     @Override
     public ServerHelloDoneParser getParser(byte[] message, int pointer) {
-        return new ServerHelloDoneParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new ServerHelloDoneParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/SrpClientKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/SrpClientKeyExchangeHandler.java
@@ -27,7 +27,7 @@ public SrpClientKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public SrpClientKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new SrpClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new SrpClientKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/SrpServerKeyExchangeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/SrpServerKeyExchangeHandler.java
@@ -29,7 +29,7 @@ public SrpServerKeyExchangeHandler(TlsContext tlsContext) {
 
     @Override
     public SrpServerKeyExchangeParser getParser(byte[] message, int pointer) {
-        return new SrpServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new SrpServerKeyExchangeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/SupplementalDataHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/SupplementalDataHandler.java
@@ -22,7 +22,7 @@ public SupplementalDataHandler(TlsContext tlsContext) {
 
     @Override
     public SupplementalDataParser getParser(byte[] message, int pointer) {
-        return new SupplementalDataParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new SupplementalDataParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/UnknownHandshakeHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/UnknownHandshakeHandler.java
@@ -28,7 +28,7 @@ public void adjustTLSContext(UnknownHandshakeMessage message) {
 
     @Override
     public UnknownHandshakeParser getParser(byte[] message, int pointer) {
-        return new UnknownHandshakeParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new UnknownHandshakeParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/UnknownMessageHandler.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/UnknownMessageHandler.java
@@ -27,7 +27,7 @@ public UnknownMessageHandler(TlsContext tlsContext, ProtocolMessageType recordCo
 
     @Override
     public UnknownMessageParser getParser(byte[] message, int pointer) {
-        return new UnknownMessageParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
+        return new UnknownMessageParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),
             recordContentMessageType, tlsContext.getConfig());
     }
 
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/SupportedVersionsExtensionParser.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/SupportedVersionsExtensionParser.java
@@ -31,6 +31,8 @@ public void parseExtensionMessageContent(SupportedVersionsExtensionMessage msg)
         if (msg.getExtensionLength().getValue() == HandshakeByteLength.VERSION) {
             // This looks like a ServerProtocolVersionExtension
             msg.setSupportedVersions(parseByteArrayField(HandshakeByteLength.VERSION));
+            LOGGER
+                .debug("Supported version: " + ArrayConverter.bytesToHexString(msg.getSupportedVersions().getValue()));
         } else {
             // This looks like a ClientProtocolVersionExtension
             parseSupportedVersionLength(msg);
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/record/preparator/RecordPreparator.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/record/preparator/RecordPreparator.java
@@ -50,6 +50,7 @@ public void prepare() {
         encrypt();
     }
 
+    @Override
     public void encrypt() {
         LOGGER.debug("Encrypting Record");
         if (chooser.getSelectedProtocolVersion().isTLS13()
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/action/executor/MessageActionResult.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/action/executor/MessageActionResult.java
@@ -22,7 +22,7 @@ public class MessageActionResult {
 
     private final List<ProtocolMessage> messageList;
 
-    private final List<DtlsHandshakeMessageFragment> messageFragmentList;
+    private List<DtlsHandshakeMessageFragment> messageFragmentList;
 
     public MessageActionResult(List<AbstractRecord> recordList, List<ProtocolMessage> messageList,
         List<DtlsHandshakeMessageFragment> messageFragmentList) {
@@ -52,15 +52,12 @@ public List<DtlsHandshakeMessageFragment> getMessageFragmentList() {
 
     /**
      * Merger this with other results, forming a new result.
+     * 
+     * @param other
      */
-    public MessageActionResult merge(MessageActionResult... other) {
-        LinkedList<MessageActionResult> results = new LinkedList<MessageActionResult>(Arrays.asList(other));
-        results.add(0, this);
-        List<AbstractRecord> recordList = new LinkedList<>();
-        List<DtlsHandshakeMessageFragment> messageFragmentList = null;
-        List<ProtocolMessage> messageList = new LinkedList<>();
+    public void merge(MessageActionResult... other) {
 
-        for (MessageActionResult result : results) {
+        for (MessageActionResult result : other) {
             recordList.addAll(result.getRecordList());
             if (result.getMessageFragmentList() != null) {
                 if (messageFragmentList == null) {
@@ -70,7 +67,5 @@ public MessageActionResult merge(MessageActionResult... other) {
             }
             messageList.addAll(result.getMessageList());
         }
-
-        return new MessageActionResult(recordList, messageList, messageFragmentList);
     }
 }
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/action/executor/ReceiveMessageHelper.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/action/executor/ReceiveMessageHelper.java

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public AlertHandler(TlsContext tlsContext) {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public AlertParser getParser(byte[] message, int pointer) {`
`31`		`- return new AlertParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`31`	`+ return new AlertParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`32`	`32`	`tlsContext.getConfig());`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public ApplicationMessageHandler(TlsContext tlsContext) {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public ApplicationMessageParser getParser(byte[] message, int pointer) {`
`31`		`- return new ApplicationMessageParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`31`	`+ return new ApplicationMessageParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`32`	`32`	`tlsContext.getConfig());`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public CertificateRequestHandler(TlsContext tlsContext) {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public CertificateRequestParser getParser(byte[] message, int pointer) {`
`39`		`- return new CertificateRequestParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`39`	`+ return new CertificateRequestParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`40`	`40`	`tlsContext.getConfig());`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public CertificateStatusHandler(TlsContext tlsContext) {`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public CertificateStatusParser getParser(byte[] message, int pointer) {`
`25`		`- return new CertificateStatusParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`25`	`+ return new CertificateStatusParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`26`	`26`	`tlsContext.getConfig());`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public CertificateVerifyHandler(TlsContext tlsContext) {`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`public CertificateVerifyParser getParser(byte[] message, int pointer) {`
`37`		`- return new CertificateVerifyParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`37`	`+ return new CertificateVerifyParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`38`	`38`	`tlsContext.getConfig());`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public ChangeCipherSpecHandler(TlsContext tlsContext) {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`public ChangeCipherSpecParser getParser(byte[] message, int pointer) {`
`39`		`- return new ChangeCipherSpecParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`39`	`+ return new ChangeCipherSpecParser(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`40`	`40`	`tlsContext.getConfig());`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public DHEServerKeyExchangeHandler(TlsContext tlsContext) {`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`public DHEServerKeyExchangeParser<T> getParser(byte[] message, int pointer) {`
`35`		`- return new DHEServerKeyExchangeParser<T>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`35`	`+ return new DHEServerKeyExchangeParser<T>(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`36`	`36`	`AlgorithmResolver.getKeyExchangeAlgorithm(tlsContext.getChooser().getSelectedCipherSuite()),`
`37`	`37`	`tlsContext.getConfig());`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public ECDHClientKeyExchangeHandler(TlsContext tlsContext) {`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public ECDHClientKeyExchangeParser<T> getParser(byte[] message, int pointer) {`
`33`		`- return new ECDHClientKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getLastRecordVersion(),`
	`33`	`+ return new ECDHClientKeyExchangeParser<>(pointer, message, tlsContext.getChooser().getSelectedProtocolVersion(),`
`34`	`34`	`tlsContext.getConfig());`
`35`	`35`	`}`
`36`	`36`