Skip to content

Commit ed5ab8d

Browse files
committed
format code
1 parent 9866c4a commit ed5ab8d

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed
Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,71 @@
11
/**
22
* TLS-Attacker - A Modular Penetration Testing Framework for TLS
3-
*
3+
* <p>
44
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
5-
*
5+
* <p>
66
* Licensed under Apache License 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0
88
*/
99
package de.rub.nds.tlsattacker.core.protocol.handler;
1010

1111
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
1212
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
13+
import de.rub.nds.tlsattacker.core.constants.ExtensionType;
1314
import de.rub.nds.tlsattacker.core.protocol.message.HelloRetryRequestMessage;
1415
import de.rub.nds.tlsattacker.core.protocol.message.extension.ExtensionMessage;
1516
import de.rub.nds.tlsattacker.core.protocol.message.extension.EncryptThenMacExtensionMessage;
1617
import de.rub.nds.tlsattacker.core.protocol.parser.HelloRetryRequestParser;
1718
import de.rub.nds.tlsattacker.core.protocol.preparator.HelloRetryRequestPreparator;
1819
import de.rub.nds.tlsattacker.core.protocol.serializer.HelloRetryRequestSerializer;
1920
import de.rub.nds.tlsattacker.core.state.TlsContext;
20-
2121
import org.junit.Before;
2222
import org.junit.Test;
2323

24-
import de.rub.nds.tlsattacker.core.constants.ExtensionType;
25-
26-
2724
import static org.junit.Assert.*;
2825

2926
public class HelloRetryRequestHandlerTest {
27+
3028
private TlsContext context;
3129
private HelloRetryRequestHandler handler;
3230

33-
3431
@Before
3532
public void setUp() {
3633
context = new TlsContext();
3734
handler = new HelloRetryRequestHandler(context);
3835
}
3936

4037
@Test
41-
public void testGetParser(){
38+
public void testGetParser() {
4239
assertTrue(handler.getParser(new byte[1], 0) instanceof HelloRetryRequestParser);
4340
}
4441

4542
@Test
46-
public void testGetPreparator(){
43+
public void testGetPreparator() {
4744
assertTrue(handler.getPreparator(new HelloRetryRequestMessage()) instanceof HelloRetryRequestPreparator);
4845
}
4946

5047
@Test
51-
public void testGetSerializer(){
48+
public void testGetSerializer() {
5249
assertTrue(handler.getSerializer(new HelloRetryRequestMessage()) instanceof HelloRetryRequestSerializer);
5350
}
5451

5552
@Test
56-
public void testAdjustTLSContext(){
53+
public void testAdjustTLSContext() {
5754
HelloRetryRequestMessage message = new HelloRetryRequestMessage();
5855
ExtensionMessage extensionMessage = new EncryptThenMacExtensionMessage();
5956
ProtocolVersion protocolVersion = ProtocolVersion.SSL2;
6057
CipherSuite cipherSuite = CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA;
6158
ExtensionType extensionType = ExtensionType.ENCRYPT_THEN_MAC;
6259

63-
6460
message.setProtocolVersion(protocolVersion.getValue());
6561
message.setSelectedCipherSuite(cipherSuite.getByteValue());
6662
message.setExtensionBytes(extensionType.getValue());
6763
message.addExtension(extensionMessage);
6864

6965
handler.adjustTLSContext(message);
70-
71-
assertSame(context.getSelectedProtocolVersion(),protocolVersion);
66+
assertSame(context.getSelectedProtocolVersion(), protocolVersion);
7267
assertSame(context.getSelectedCipherSuite(), cipherSuite);
7368
assertTrue(context.isExtensionProposed(extensionType));
74-
7569
}
7670

7771
}

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/action/CopyBufferedRecordsActionTest.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* TLS-Attacker - A Modular Penetration Testing Framework for TLS
3-
*
3+
* <p>
44
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
5-
*
5+
* <p>
66
* Licensed under Apache License 2.0
77
* http://www.apache.org/licenses/LICENSE-2.0
88
*/
@@ -13,24 +13,24 @@
1313
import de.rub.nds.tlsattacker.core.record.AbstractRecord;
1414
import de.rub.nds.tlsattacker.core.record.Record;
1515
import de.rub.nds.tlsattacker.core.state.TlsContext;
16-
import static org.junit.Assert.*;
17-
1816
import org.junit.Before;
1917
import org.junit.Test;
2018

2119
import java.util.LinkedList;
2220

21+
import static org.junit.Assert.*;
22+
2323
public class CopyBufferedRecordsActionTest {
24-
private CopyBufferedRecordsAction action;
2524

25+
private CopyBufferedRecordsAction action;
2626

2727
@Before
2828
public void setUp() {
29-
action = new CopyBufferedRecordsAction("src", "dst");
29+
action = new CopyBufferedRecordsAction("src", "dst");
3030
}
3131

3232
@Test
33-
public void testCopyField(){
33+
public void testCopyField() {
3434
TlsContext src = new TlsContext();
3535
TlsContext dst = new TlsContext();
3636
ModifiableByteArray byteArray = new ModifiableByteArray();
@@ -42,27 +42,23 @@ public void testCopyField(){
4242
record.setMaxRecordLengthConfig(18);
4343
record.setCleanProtocolMessageBytes(new byte[1]);
4444
record.setCompleteRecordBytes(new byte[1]);
45-
4645
recordBuffer.add(record);
4746
src.setRecordBuffer(recordBuffer);
4847

49-
action.copyField(src , dst);
48+
action.copyField(src, dst);
5049
assertSame(src.getRecordBuffer(), dst.getRecordBuffer());
51-
52-
5350
}
5451

5552
@Test
56-
public void testExecutedAsPlanned(){
53+
public void testExecutedAsPlanned() {
5754
action.setExecuted(true);
5855
assertTrue(action.executedAsPlanned());
5956
action.setExecuted(false);
6057
assertFalse(action.executedAsPlanned());
6158
}
6259

63-
6460
@Test
65-
public void testReset(){
61+
public void testReset() {
6662
action.setExecuted(true);
6763
action.reset();
6864
assertFalse(action.isExecuted());

0 commit comments

Comments
 (0)