Merge pull request #412 from RUB-NDS/mergefixes

Mergefixes

Author: ic0ns

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

@@ -53,7 +53,7 @@ private HandshakeMessageType() {
     static {
         MAP = new HashMap<>();
         for (HandshakeMessageType cm : HandshakeMessageType.values()) {
-            if (cm == UNKNOWN) {
+            if (cm == UNKNOWN || cm.name().contains("SSL2")) {
                 continue;
             }
             MAP.put((byte) cm.value, cm);

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

@@ -31,8 +31,8 @@ public static Collection<Object[]> generateData() {
                 .asList(new Object[][] { {
                         ArrayConverter
                                 .hexStringToByteArray("802b0100020012000000100100800700c0030080060040020080040080bc4c7de14f6fc8bff4428f159fb24f2b"),
-                        ProtocolVersion.SSL2, 0x802B, HandshakeMessageType.CLIENT_HELLO,
-                        ProtocolVersion.SSL2.getValue(), 18/* 0x0012 */, 0, 16/* 0x0010 */,
+                        ProtocolVersion.SSL2, 43, HandshakeMessageType.CLIENT_HELLO, ProtocolVersion.SSL2.getValue(),
+                        18/* 0x0012 */, 0, 16/* 0x0010 */,
                         ArrayConverter.hexStringToByteArray("0100800700c0030080060040020080040080"), new byte[0],
                         ArrayConverter.hexStringToByteArray("bc4c7de14f6fc8bff4428f159fb24f2b") } });
     }

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

@@ -33,7 +33,7 @@ public static Collection<Object[]> generateData() {
                         ArrayConverter
                                 .hexStringToByteArray("820e020001000201ed00060010308201e930820152020106300d06092a864886f70d0101040500305b310b3009060355040613024155311330110603550408130a517565656e736c616e64311a3018060355040a13114372797074536f667420507479204c7464311b301906035504031312546573742043412028313032342062697429301e170d3030313031363232333130335a170d3033303131343232333130335a3063310b3009060355040613024155311330110603550408130a517565656e736c616e64311a3018060355040a13114372797074536f667420507479204c7464312330210603550403131a5365727665722074657374206365727420283531322062697429305c300d06092a864886f70d0101010500034b0030480241009fb3c3842795ff1231520f15ef4611c4ad80e6365b0fdd80d7618de0fc72450934fe556645434c68976afea8a0a5df5f78ffeed764b83f04cb6fff2afefeb9ed0203010001300d06092a864886f70d01010405000381810093d20ac541e65aa986f91187e4db45e2c595781a6c806d731fb46d44a3ba8688c858cd1c06356c446288dfe4f6646195ef4aa67f6571d76b8839f632bfac936769518c93ec485fc9b142f955d27e4ef4f2216b9057e6d7999e41ca80bf1a28a2ca5b504aed84e782c7d2cf369e6a67b988a7f38ad004f8e8c617e3c529bc17f10400800200807aa9b1cbab16a84bd99416f443587d0c"),
                         ProtocolVersion.SSL2,
-                        0x820e,
+                        526,
                         HandshakeMessageType.SERVER_HELLO,
                         0 /* 0x00 */,
                         1 /* 0x01 */,