Merge pull request #753 from tls-attacker/PskExtensionBugFix

Psk extension bug fix

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/connection/AliasedConnection.java

@@ -26,7 +26,7 @@ public abstract class AliasedConnection extends Connection implements Aliasable
     public static final String DEFAULT_CONNECTION_ALIAS = "defaultConnection";
     public static final TransportHandlerType DEFAULT_TRANSPORT_HANDLER_TYPE = TransportHandlerType.TCP;
     public static final Integer DEFAULT_TIMEOUT = 1000;
-    public static final Integer DEFAULT_CONNECTION_TIMEOUT = 60000;
+    public static final Integer DEFAULT_CONNECTION_TIMEOUT = 8000;
     public static final Integer DEFAULT_FIRST_TIMEOUT = DEFAULT_TIMEOUT;
     public static final String DEFAULT_HOSTNAME = "localhost";
     public static final String DEFAULT_IP = "127.0.0.1";

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/PreSharedKeyExtensionParser.java

@@ -35,7 +35,7 @@ public PreSharedKeyExtensionParser(int startposition, byte[] array, Config confi
     public void parseExtensionMessageContent(PreSharedKeyExtensionMessage msg) {
         LOGGER.debug("Parsing PreSharedKeyExtensionMessage");
         // Client -> Server
-        if (super.getBytesLeft() > 2) {
+        if (msg.getExtensionLength().getValue() > 2) {
             parsePreSharedKeyIdentityListLength(msg);
             parsePreSharedKeyIdentityListBytes(msg);
             parsePreSharedKeyBinderListLength(msg);