Skip to content

Commit ce9c769

Browse files
committed
Formatting
1 parent 9fc91d1 commit ce9c769

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

TLS-Scanner-Core/src/test/java/de/rub/nds/tlsscanner/core/vector/response/FingerprintCheckerTest.java

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

10-
/**
11-
* TLS-Attacker - A Modular Penetration Testing Framework for TLS
12-
*
13-
* Copyright 2014-2022 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
14-
*
15-
* Licensed under Apache License, Version 2.0
16-
* http://www.apache.org/licenses/LICENSE-2.0.txt
17-
*/
18-
1910
package de.rub.nds.tlsscanner.core.vector.response;
2011

2112
import de.rub.nds.modifiablevariable.util.ArrayConverter;
@@ -25,11 +16,8 @@
2516
import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage;
2617
import de.rub.nds.tlsattacker.core.protocol.message.HandshakeMessage;
2718
import de.rub.nds.tlsattacker.core.protocol.message.ClientHelloMessage;
28-
import de.rub.nds.tlsattacker.core.protocol.message.ClientKeyExchangeMessage;
2919
import de.rub.nds.tlsattacker.core.protocol.message.ServerHelloMessage;
3020
import de.rub.nds.tlsattacker.core.protocol.message.CertificateMessage;
31-
import de.rub.nds.tlsattacker.core.protocol.message.HelloMessage;
32-
import de.rub.nds.tlsattacker.core.protocol.message.ServerKeyExchangeMessage;
3321
import de.rub.nds.tlsattacker.core.protocol.message.ServerHelloDoneMessage;
3422
import de.rub.nds.tlsattacker.core.record.AbstractRecord;
3523
import de.rub.nds.tlsattacker.core.record.Record;
@@ -38,8 +26,6 @@
3826
import java.util.LinkedList;
3927
import java.util.List;
4028
import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
41-
import de.rub.nds.modifiablevariable.VariableModification;
42-
import de.rub.nds.modifiablevariable.singlebyte.ByteAddModification;
4329

4430
import static org.junit.Assert.*;
4531
import org.junit.Test;
@@ -152,9 +138,8 @@ public static Collection<Object[]> generateData() {
152138
Record serverHelloRecord = parseRecord(ProtocolMessageType.HANDSHAKE, ProtocolVersion.TLS12.getValue(), 78,
153139
ArrayConverter.hexStringToByteArray(
154140
"160303004e0200004a03030fa96863574fc48715a6aa266f5f954a2a3fbcaa6a359b663c21dde3c71e6f2400c030000022ff0100010000000000000b0004030001020023000000100005000302683200170000"));
155-
Record serverHelloRecordDiffContent = parseRecord(ProtocolMessageType.HANDSHAKE, ProtocolVersion.TLS12.getValue(), 78,
156-
ArrayConverter.hexStringToByteArray(
157-
"00"));
141+
Record serverHelloRecordDiffContent = parseRecord(ProtocolMessageType.HANDSHAKE,
142+
ProtocolVersion.TLS12.getValue(), 78, ArrayConverter.hexStringToByteArray("00"));
158143

159144
HandshakeMessage certificateMsg =
160145
parseMessage(HandshakeMessageType.CERTIFICATE.getValue(), 4050, null, ArrayConverter.hexStringToByteArray(
@@ -348,20 +333,19 @@ public static Collection<Object[]> generateData() {
348333
msgListTestMsgClassWithPriority.add(clientKeyExchangeMsg);
349334
expectedResultMsgClassWithPriority = EqualityError.MESSAGE_CLASS;
350335

351-
//Data for test with expected EqualityError:
352-
//EqualityError.MessageContent
336+
// Data for test with expected EqualityError:
337+
// EqualityError.MessageContent
353338
// with PriorityCheck regarding EqualityError.RecordContent
354339
EqualityError expectedResultMsgContentWithPriority;
355340
expectedResultMsgContentWithPriority = EqualityError.MESSAGE_CONTENT;
356-
341+
357342
List<AbstractRecord> recordListTestServerWithContentError = new LinkedList<>();
358-
343+
359344
recordListTestServerWithContentError.add(serverHelloRecordDiffContent);
360345
recordListTestServerWithContentError.add(certificateRecord);
361346
recordListTestServerWithContentError.add(serverKeyExchangeRecord);
362347
recordListTestServerWithContentError.add(serverHelloDoneRecord);
363-
364-
348+
365349
// Data for test with expected EqualityError:
366350
// EqualityError.MESSAGE_COUNT
367351
// with PriorityCheck regarding EqualityError.RecordContent
@@ -469,8 +453,8 @@ public static Collection<Object[]> generateData() {
469453
// Tests with PriorityCheck regarding EqualityError.Record_Content
470454
{ msgListTestClient, recordListTestClient, stateTestClient, msgListTestMsgClassWithPriority,
471455
recordListTestClientWithContentError, stateTestClient, expectedResultMsgClassWithPriority },
472-
{ msgListTestServer, recordListTestServer, stateTestServer, msgListTestMsgContent, recordListTestServerWithContentError,
473-
stateTestServer, expectedResultMsgContentWithPriority },
456+
{ msgListTestServer, recordListTestServer, stateTestServer, msgListTestMsgContent,
457+
recordListTestServerWithContentError, stateTestServer, expectedResultMsgContentWithPriority },
474458
{ msgListTestClient, recordListTestClient, stateTestClient, msgListTestMsgCountWithPriority,
475459
recordListTestClientWithContentError, stateTestClient, expectedResultMsgCountWithPriority },
476460
{ msgListTestClient, recordListTestClient, stateTestClient, msgListTestClient,

0 commit comments

Comments
 (0)