Improved code style/format

Author: David Ziemann

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/serializer/SSL2ClientMasterKeySerializerTest.java

@@ -1,3 +1,11 @@
+/**
+ * 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.serializer;
 
 import static org.junit.Assert.*;
@@ -19,51 +27,41 @@
 @RunWith(Parameterized.class)
 public class SSL2ClientMasterKeySerializerTest {
 
-	private final ProtocolVersion version  = ProtocolVersion.SSL2;
-	private SSL2ClientMasterKeyMessage message;
-	private byte[] expectedClientMasterKeyMessage;
-	
+    private final ProtocolVersion version = ProtocolVersion.SSL2;
+    private SSL2ClientMasterKeyMessage message;
+    private byte[] expectedClientMasterKeyMessage;
+
     @Parameterized.Parameters
     public static Collection<Object[]> generateData() {
-		byte[] expectedClientMasterKeyMessage = ArrayConverter.hexStringToByteArray(
-		 "808a02010080000000800000b28367d5b44f6f585096540ab798705ecb6ce66336d5068952db71542701870754fdc25da8414d0977ec0401b5ff4cc853779d6069be867bf65a2250d14a189d74c608f4f76a9aa8a4f1a909370b86f5fd0740d368083e78e1034e38573b32799cf59ea52a771633ffdbd0e8123ada764f677cd09b05106ea9af8168a71249d4"
-		);		
-		byte[]  encryptedKey = ArrayConverter.hexStringToByteArray(
-		 "b28367d5b44f6f585096540ab798705ecb6ce66336d5068952db71542701870754fdc25da8414d0977ec0401b5ff4cc853779d6069be867bf65a2250d14a189d74c608f4f76a9aa8a4f1a909370b86f5fd0740d368083e78e1034e38573b32799cf59ea52a771633ffdbd0e8123ada764f677cd09b05106ea9af8168a71249d4"
-		);
-    	byte[] cipher = BigInteger.valueOf(SSL2CipherSuite.SSL_CK_RC4_128_WITH_MD5.getValue()).toByteArray();
-        
-    	return Arrays.asList(new Object[][] {{
-    		138,
-    		HandshakeMessageType.SSL2_CLIENT_MASTER_KEY.getValue(),
-    		cipher,
-    		0,
-    		128,
-    		0,
-    		new byte[0],
-    		encryptedKey,
-    		expectedClientMasterKeyMessage
-        }});   	
+        byte[] expectedClientMasterKeyMessage = ArrayConverter
+                .hexStringToByteArray("808a02010080000000800000b28367d5b44f6f585096540ab798705ecb6ce66336d5068952db71542701870754fdc25da8414d0977ec0401b5ff4cc853779d6069be867bf65a2250d14a189d74c608f4f76a9aa8a4f1a909370b86f5fd0740d368083e78e1034e38573b32799cf59ea52a771633ffdbd0e8123ada764f677cd09b05106ea9af8168a71249d4");
+        byte[] encryptedKey = ArrayConverter
+                .hexStringToByteArray("b28367d5b44f6f585096540ab798705ecb6ce66336d5068952db71542701870754fdc25da8414d0977ec0401b5ff4cc853779d6069be867bf65a2250d14a189d74c608f4f76a9aa8a4f1a909370b86f5fd0740d368083e78e1034e38573b32799cf59ea52a771633ffdbd0e8123ada764f677cd09b05106ea9af8168a71249d4");
+        byte[] cipher = BigInteger.valueOf(SSL2CipherSuite.SSL_CK_RC4_128_WITH_MD5.getValue()).toByteArray();
+
+        return Arrays.asList(new Object[][] { { 138, HandshakeMessageType.SSL2_CLIENT_MASTER_KEY.getValue(), cipher, 0,
+                128, 0, new byte[0], encryptedKey, expectedClientMasterKeyMessage } });
     }
-    
+
     public SSL2ClientMasterKeySerializerTest(int messageLength, byte messageType, byte[] cipher, int clearKeyLength,
-    		int encryptedKeyLength, int keyArgLength, byte[] clearKeyData,byte[] encryptedKey, byte[] expectedClientMasterKeyMessage) {    	
-    	this.expectedClientMasterKeyMessage = expectedClientMasterKeyMessage;
-    	this.message = new SSL2ClientMasterKeyMessage();
-		this.message.setMessageLength(messageLength);
-		this.message.setType(messageType);
-		this.message.setCipherKind(cipher);
-		this.message.setClearKeyLength(clearKeyLength);
-		this.message.setEncryptedKeyLength(encryptedKeyLength);	
-		this.message.setKeyArgLength(keyArgLength);
-		this.message.setClearKeyData(clearKeyData);
-		this.message.setEncryptedKeyData(encryptedKey);   	
+            int encryptedKeyLength, int keyArgLength, byte[] clearKeyData, byte[] encryptedKey,
+            byte[] expectedClientMasterKeyMessage) {
+        this.expectedClientMasterKeyMessage = expectedClientMasterKeyMessage;
+        this.message = new SSL2ClientMasterKeyMessage();
+        this.message.setMessageLength(messageLength);
+        this.message.setType(messageType);
+        this.message.setCipherKind(cipher);
+        this.message.setClearKeyLength(clearKeyLength);
+        this.message.setEncryptedKeyLength(encryptedKeyLength);
+        this.message.setKeyArgLength(keyArgLength);
+        this.message.setClearKeyData(clearKeyData);
+        this.message.setEncryptedKeyData(encryptedKey);
+    }
+
+    @Test
+    public void test() {
+        SSL2ClientMasterKeySerializer serializer = new SSL2ClientMasterKeySerializer(this.message, this.version);
+        byte[] result = serializer.serializeProtocolMessageContent();
+        assertArrayEquals(this.expectedClientMasterKeyMessage, result);
     }
-    
-	@Test
-	public void test() {
-		SSL2ClientMasterKeySerializer serializer = new SSL2ClientMasterKeySerializer(this.message, this.version);
-		byte[] result = serializer.serializeProtocolMessageContent();			
-		assertArrayEquals(this.expectedClientMasterKeyMessage,result);
-	}
 }