Modified Constants for SupplementalDataEntryParser according to RFC 4680

Author: jan

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

@@ -236,16 +236,6 @@ public class ExtensionByteLength {
 
     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
-     */
-    public static final int SUPPLEMENTAL_DATA_ENTRY_LENGTH = 2;
-
     private ExtensionByteLength() {
     }
 }

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

@@ -220,6 +220,16 @@ public class HandshakeByteLength {
      * Length of the Supplemental Data Field
      */
     public static final int SUPPLEMENTAL_DATA_LENGTH = 3;
+    
+    /**
+     * Length of the Supplemental Data Entry Type
+     */
+    public static final int SUPPLEMENTAL_DATA_ENTRY_TYPE_LENGTH = 2;
+
+    /**
+     * Length of the Supplemental Data Entry
+     */
+    public static final int SUPPLEMENTAL_DATA_ENTRY_LENGTH = 2;
 
     private HandshakeByteLength() {
     }

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

@@ -9,7 +9,7 @@
 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.constants.HandshakeByteLength;
 import de.rub.nds.tlsattacker.core.protocol.message.suppData.SupplementalDataEntry;
 import de.rub.nds.tlsattacker.core.protocol.parser.Parser;
 
@@ -29,12 +29,12 @@ public SupplementalDataEntry parse() {
     }
 
     private void parseSupplementalDataEntryType(SupplementalDataEntry entry) {
-        entry.setSupplementalDataEntryType(parseIntField(ExtensionByteLength.SUPPLEMENTAL_DATA_ENTRY_TYPE_LENGTH));
+        entry.setSupplementalDataEntryType(parseIntField(HandshakeByteLength.SUPPLEMENTAL_DATA_ENTRY_TYPE_LENGTH));
         LOGGER.debug("SupplementalDataEntryType: " + entry.getSupplementalDataEntryType().getValue());
     }
 
     private void parseSupplementalDataEntryLength(SupplementalDataEntry entry) {
-        entry.setSupplementalDataEntryLength(parseIntField(ExtensionByteLength.SUPPLEMENTAL_DATA_ENTRY_LENGTH));
+        entry.setSupplementalDataEntryLength(parseIntField(HandshakeByteLength.SUPPLEMENTAL_DATA_ENTRY_LENGTH));
         LOGGER.debug("SupplementalDataEntryLength: " + entry.getSupplementalDataEntryLength().getValue());
     }