Added SupplementalDataParserTest

Testvalues from https://pike.lysator.liu.se/docs/ietf/rfc/58/rfc5878.xml

Author: jan

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

@@ -19,9 +19,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * TODO
- */
 public class SupplementalDataParser extends HandshakeMessageParser<SupplementalDataMessage> {
 
     /**

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

@@ -41,7 +41,8 @@ private void parseSupplementalDataEntryLength(SupplementalDataEntry entry) {
 
     private void parseSupplementalDataEntry(SupplementalDataEntry entry) {
         entry.setSupplementalDataEntry(parseByteArrayField(entry.getSupplementalDataEntryLength().getValue()));
-        LOGGER.debug("SupplementalDataEntry: " + ArrayConverter.bytesToHexString(entry.getSupplementalDataEntry().getValue()));
+        LOGGER.debug("SupplementalDataEntry: "
+                + ArrayConverter.bytesToHexString(entry.getSupplementalDataEntry().getValue()));
     }
 
 }

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/parser/SupplementalDataParserTest.java

@@ -0,0 +1,74 @@
+/**
+ * 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;
+
+import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
+import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
+import de.rub.nds.tlsattacker.core.protocol.message.SupplementalDataMessage;
+import java.util.Arrays;
+import java.util.Collection;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class SupplementalDataParserTest {
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> generateData() {
+        return Arrays
+                .asList(new Object[][] {
+                        { ArrayConverter.hexStringToByteArray("1700001100000e4002000a0008010005aaaaaaaaaa"),
+                                HandshakeMessageType.SUPPLEMENTAL_DATA, 17, 14,
+                                ArrayConverter.hexStringToByteArray("4002000a0008010005aaaaaaaaaa"),
+                                ProtocolVersion.TLS11 },
+                        {
+                                ArrayConverter
+                                        .hexStringToByteArray("1700001F00001c4002000a0008010005aaaaaaaaaa4002000a0008010005aaaaaaaaaa"),
+                                HandshakeMessageType.SUPPLEMENTAL_DATA,
+                                31,
+                                28,
+                                ArrayConverter
+                                        .hexStringToByteArray("4002000a0008010005aaaaaaaaaa4002000a0008010005aaaaaaaaaa"),
+                                ProtocolVersion.TLS11 } });
+    }
+
+    private byte[] message;
+    private HandshakeMessageType type;
+    private int length;
+
+    private int supplementalDataLength;
+    private byte[] supplementalDataBytes;
+    private ProtocolVersion version;
+
+    public SupplementalDataParserTest(byte[] message, HandshakeMessageType type, int length,
+            int supplementalDataLength, byte[] supplementalDataBytes, ProtocolVersion version) {
+        this.message = message;
+        this.type = type;
+        this.length = length;
+        this.supplementalDataLength = supplementalDataLength;
+        this.supplementalDataBytes = supplementalDataBytes;
+        this.version = version;
+    }
+
+    @Test
+    public void testParse() {
+        SupplementalDataParser parser = new SupplementalDataParser(0, message, version);
+        SupplementalDataMessage suppDataMessage = parser.parse();
+        assertArrayEquals(suppDataMessage.getCompleteResultingMessage().getValue(), message);
+        assertTrue(suppDataMessage.getType().getValue() == type.getValue());
+        assertTrue(suppDataMessage.getLength().getValue() == length);
+        assertTrue(suppDataMessage.getSupplementalDataLength().getValue() == supplementalDataLength);
+        assertArrayEquals(suppDataMessage.getSupplementalDataBytes().getValue(), supplementalDataBytes);
+    }
+
+}

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/parser/suppData/SupplementalDataEntryParserTest.java

@@ -20,32 +20,26 @@
 
 @RunWith(Parameterized.class)
 public class SupplementalDataEntryParserTest {
-    
+
     @Parameterized.Parameters
     public static Collection<Object[]> generateData() {
-        return Arrays.asList(new Object[][] {
-            {
-                ArrayConverter.hexStringToByteArray("4002000a0008010005aaaaaaaaaa"),
-                16386,
-                10,
-                ArrayConverter.hexStringToByteArray("0008010005aaaaaaaaaa"),
-            }
-        });
+        return Arrays.asList(new Object[][] { { ArrayConverter.hexStringToByteArray("4002000a0008010005aaaaaaaaaa"),
+                16386, 10, ArrayConverter.hexStringToByteArray("0008010005aaaaaaaaaa") } });
     }
-    
+
     private int supplementalDataEntryType;
     private int supplementalDataEntryLength;
     private byte[] supplementalDataEntry;
     private byte[] supplementalDataTestEntry;
-    
-    public SupplementalDataEntryParserTest(byte[] supplementalDataTestEntry, int supplementalDataEntryType, 
+
+    public SupplementalDataEntryParserTest(byte[] supplementalDataTestEntry, int supplementalDataEntryType,
             int supplementalDataEntryLength, byte[] supplementalDataEntry) {
         this.supplementalDataEntryType = supplementalDataEntryType;
         this.supplementalDataEntryLength = supplementalDataEntryLength;
         this.supplementalDataEntry = supplementalDataEntry;
         this.supplementalDataTestEntry = supplementalDataTestEntry;
     }
-    
+
     @Test
     public void testParse() {
         SupplementalDataEntryParser parser = new SupplementalDataEntryParser(0, supplementalDataTestEntry);