Added SupplementalDataEntryParser and SupplementalDataParser

Added Constants for these two Parsers

Author: jan

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/ExtensionByteLength.java

@@ -235,12 +235,12 @@ public class ExtensionByteLength {
     public static final int CERTIFICATE_STATUS_REQUEST_V2_LIST = 2;
 
     public static final int RENEGOTIATION_INFO = 1;
-    
+
     /**
      * Length of the Supplemental Data Entry Type
      */
     public static final int SUPPLEMENTAL_DATA_ENTRY_TYPE_LENGTH = 2;
-    
+
     /**
      * Length of the Supplemental Data Entry
      */

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/HandshakeByteLength.java

@@ -215,7 +215,7 @@ public class HandshakeByteLength {
      * length of the ClientAuthenticationType in the TLS byte arrays
      */
     public static final int CLIENT_AUTHENTICATION_TYPE = 1;
-    
+
     /**
      * Length of the Supplemental Data Field
      */

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

@@ -12,9 +12,10 @@
 import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
 import de.rub.nds.tlsattacker.core.constants.HandshakeByteLength;
+import de.rub.nds.tlsattacker.core.exceptions.ParserException;
 import de.rub.nds.tlsattacker.core.protocol.message.SupplementalDataMessage;
-import de.rub.nds.tlsattacker.core.protocol.message.extension.SupplementalData.SupplementalDataEntry;
-import de.rub.nds.tlsattacker.core.protocol.parser.extension.SupplementalDataEntryParser;
+import de.rub.nds.tlsattacker.core.protocol.message.suppData.SupplementalDataEntry;
+import de.rub.nds.tlsattacker.core.protocol.parser.suppData.SupplementalDataEntryParser;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -44,27 +45,33 @@ protected void parseHandshakeMessageContent(SupplementalDataMessage msg) {
         LOGGER.debug("Parsing SupplementalDataMessage");
         parseSupplementalDataLength(msg);
         parseSupplementalDataBytes(msg);
+        parseSupplementalDataEntries(msg);
     }
 
     @Override
     protected SupplementalDataMessage createHandshakeMessage() {
         return new SupplementalDataMessage();
     }
-    
+
     private void parseSupplementalDataLength(SupplementalDataMessage msg) {
         msg.setSupplementalDataLength(parseIntField(HandshakeByteLength.SUPPLEMENTAL_DATA_LENGTH));
         LOGGER.debug("SupplementalDataLength: " + msg.getSupplementalDataLength().getValue());
     }
 
     private void parseSupplementalDataBytes(SupplementalDataMessage msg) {
-        byte[] supplementalDataBytes = parseByteArrayField(msg.getSupplementalDataLength().getValue());
-        msg.setSupplementalDataBytes(supplementalDataBytes);
+        msg.setSupplementalDataBytes(parseByteArrayField(msg.getSupplementalDataLength().getValue()));
         LOGGER.debug("SupplementalDataBytes: " + ArrayConverter.bytesToHexString(msg.getSupplementalDataBytes().getValue()));
-        List<SupplementalDataEntry> entryList = new LinkedList<>();
+    }
+
+    private void parseSupplementalDataEntries(SupplementalDataMessage msg) {
         int pointer = 0;
-        while (pointer < supplementalDataBytes.length) {
-            SupplementalDataEntryParser parser = new SupplementalDataEntryParser(pointer, supplementalDataBytes);
+        List<SupplementalDataEntry> entryList = new LinkedList<>();
+        while (pointer < msg.getSupplementalDataLength().getValue()) {
+            SupplementalDataEntryParser parser = new SupplementalDataEntryParser(pointer, msg.getSupplementalDataBytes().getValue());
             entryList.add(parser.parse());
+            if (pointer == parser.getPointer()) {
+                throw new ParserException("Ran into infinite Loop while parsing SupplementalDataEntries");
+            }
             pointer = parser.getPointer();
         }
         msg.setEntries(entryList);

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/suppData/SupplementalDataEntryParser.java

@@ -0,0 +1,46 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.protocol.parser.suppData;
+
+import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.tlsattacker.core.constants.ExtensionByteLength;
+import de.rub.nds.tlsattacker.core.protocol.message.suppData.SupplementalDataEntry;
+import de.rub.nds.tlsattacker.core.protocol.parser.Parser;
+
+public class SupplementalDataEntryParser extends Parser<SupplementalDataEntry> {
+
+    public SupplementalDataEntryParser(int startposition, byte[] array) {
+        super(startposition, array);
+    }
+
+    @Override
+    public SupplementalDataEntry parse() {
+        LOGGER.debug("Parsing SupplementalDataEntry");
+        SupplementalDataEntry entry = new SupplementalDataEntry();
+        parseSupplementalDataEntryType(entry);
+        parseSupplementalDataEntryLength(entry);       
+        return entry;
+    }
+    
+    private void parseSupplementalDataEntryType(SupplementalDataEntry entry) {
+        entry.setSupplementalDataEntryType(parseIntField(ExtensionByteLength.SUPPLEMENTAL_DATA_ENTRY_TYPE_LENGTH));
+        LOGGER.debug("SupplementalDataEntryType: " + entry.getSupplementalDataEntryType().getValue());
+    }
+    
+    private void parseSupplementalDataEntryLength(SupplementalDataEntry entry) {
+        entry.setSupplementalDataEntryLength(parseIntField(ExtensionByteLength.SUPPLEMENTAL_DATA_ENTRY_LENGTH));
+        LOGGER.debug("SupplementalDataEntryLength: " + entry.getSupplementalDataEntryLength().getValue());
+    }
+    
+    private void parseSupplementalDataEntryBytes(SupplementalDataEntry entry) {
+        entry.setSupplementalDataEntry(parseByteArrayField(entry.getSupplementalDataEntryLength().getValue()));
+        LOGGER.debug("SupplementalDataEntry: " + ArrayConverter.bytesToHexString(entry.getSupplementalDataEntry().getValue()));
+    }
+
+}