Skip to content

Commit 119af05

Browse files
ic0nsic0ns
authored
Merge pull request #207 from RUB-NDS/connectionEndType
refactor: Rename ConnectionEnd to ConnectionEndType
2 parents 95af4cb + 2e9e4be commit 119af05

File tree

36 files changed

+151
-155
lines changed

36 files changed

+151
-155
lines changed

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/Lucky13Attacker.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
*/
99
package de.rub.nds.tlsattacker.attacks.impl;
1010

11+
import java.io.FileWriter;
12+
import java.io.IOException;
13+
import java.util.Collections;
14+
import java.util.HashMap;
15+
import java.util.LinkedList;
16+
import java.util.List;
17+
import java.util.Map;
18+
import org.apache.logging.log4j.LogManager;
19+
import org.apache.logging.log4j.Logger;
20+
1121
import de.rub.nds.tlsattacker.attacks.config.Lucky13CommandConfig;
1222
import de.rub.nds.modifiablevariable.VariableModification;
1323
import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
@@ -17,27 +27,14 @@
1727
import de.rub.nds.tlsattacker.core.protocol.message.AlertMessage;
1828
import de.rub.nds.tlsattacker.core.protocol.message.ApplicationMessage;
1929
import de.rub.nds.tlsattacker.core.record.Record;
20-
import de.rub.nds.tlsattacker.core.util.LogLevel;
2130
import de.rub.nds.tlsattacker.core.workflow.TlsConfig;
2231
import de.rub.nds.tlsattacker.core.workflow.TlsContext;
2332
import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutor;
2433
import de.rub.nds.tlsattacker.core.workflow.WorkflowExecutorFactory;
2534
import de.rub.nds.tlsattacker.core.workflow.WorkflowTrace;
26-
import de.rub.nds.tlsattacker.core.workflow.action.MessageActionFactory;
2735
import de.rub.nds.tlsattacker.core.workflow.action.ReceiveAction;
2836
import de.rub.nds.tlsattacker.core.workflow.action.SendAction;
29-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
30-
import de.rub.nds.tlsattacker.transport.TransportHandler;
3137
import de.rub.nds.modifiablevariable.util.ArrayConverter;
32-
import java.io.FileWriter;
33-
import java.io.IOException;
34-
import java.util.Collections;
35-
import java.util.HashMap;
36-
import java.util.LinkedList;
37-
import java.util.List;
38-
import java.util.Map;
39-
import org.apache.logging.log4j.LogManager;
40-
import org.apache.logging.log4j.Logger;
4138

4239
/**
4340
* Executes the Lucky13 attack test

‎TLS-Client/src/test/java/de/rub/nds/tlsattacker/client/main/TlsClientTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import de.rub.nds.tlsattacker.core.workflow.WorkflowTrace;
6060
import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
6161
import de.rub.nds.tlsattacker.core.workflow.action.MessageActionFactory;
62-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
62+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
6363
import de.rub.nds.tlsattacker.util.FixedTimeProvider;
6464
import de.rub.nds.tlsattacker.util.TimeHelper;
6565
import de.rub.nds.tlsattacker.util.tests.IntegrationTests;
@@ -209,15 +209,15 @@ private boolean testCustomWorkflow(int port) {
209209
config.setWorkflowTrace(new WorkflowTrace());
210210

211211
WorkflowTrace trace = config.getWorkflowTrace();
212-
trace.add(MessageActionFactory.createAction(ConnectionEnd.CLIENT, ConnectionEnd.CLIENT, new ClientHelloMessage(
213-
config)));
214-
trace.add(MessageActionFactory.createAction(ConnectionEnd.CLIENT, ConnectionEnd.SERVER, new ServerHelloMessage(
215-
config), new CertificateMessage(config), new ServerHelloDoneMessage(config)));
212+
trace.add(MessageActionFactory.createAction(ConnectionEndType.CLIENT, ConnectionEndType.CLIENT,
213+
new ClientHelloMessage(config)));
214+
trace.add(MessageActionFactory.createAction(ConnectionEndType.CLIENT, ConnectionEndType.SERVER,
215+
new ServerHelloMessage(config), new CertificateMessage(config), new ServerHelloDoneMessage(config)));
216216

217-
trace.add(MessageActionFactory.createAction(ConnectionEnd.CLIENT, ConnectionEnd.CLIENT,
217+
trace.add(MessageActionFactory.createAction(ConnectionEndType.CLIENT, ConnectionEndType.CLIENT,
218218
new RSAClientKeyExchangeMessage(config), new ChangeCipherSpecMessage(config), new FinishedMessage(
219219
config)));
220-
trace.add(MessageActionFactory.createAction(ConnectionEnd.CLIENT, ConnectionEnd.SERVER,
220+
trace.add(MessageActionFactory.createAction(ConnectionEndType.CLIENT, ConnectionEndType.SERVER,
221221
new ChangeCipherSpecMessage(config), new FinishedMessage(config)));
222222
WorkflowExecutor workflowExecutor = WorkflowExecutorFactory.createWorkflowExecutor(config.getExecutorType(),
223223
tlsContext);

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/delegate/ClientDelegate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.beust.jcommander.Parameter;
1212
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
1313
import de.rub.nds.tlsattacker.core.workflow.TlsConfig;
14-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
14+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
1515

1616
/**
1717
*
@@ -46,7 +46,7 @@ public void applyDelegate(TlsConfig config) {
4646
throw new ConfigurationException("Could not parse provided host: " + host);
4747
}
4848
}
49-
config.setConnectionEnd(ConnectionEnd.CLIENT);
49+
config.setConnectionEndType(ConnectionEndType.CLIENT);
5050
}
5151

5252
}

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/delegate/MitmDelegate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.beust.jcommander.Parameter;
1212

1313
import de.rub.nds.tlsattacker.core.workflow.TlsConfig;
14-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
14+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
1515

1616
/**
1717
*
@@ -39,7 +39,7 @@ public void applyDelegate(TlsConfig config) {
3939
if (port != null) {
4040
config.setPort(port);
4141
}
42-
config.setConnectionEnd(ConnectionEnd.SERVER);
42+
config.setConnectionEndType(ConnectionEndType.SERVER);
4343
}
4444

4545
}

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/delegate/ServerDelegate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import com.beust.jcommander.Parameter;
1212
import de.rub.nds.tlsattacker.core.workflow.TlsConfig;
13-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
13+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
1414

1515
/**
1616
*
@@ -38,7 +38,7 @@ public void applyDelegate(TlsConfig config) {
3838
if (port != null) {
3939
config.setPort(port);
4040
}
41-
config.setConnectionEnd(ConnectionEnd.SERVER);
41+
config.setConnectionEndType(ConnectionEndType.SERVER);
4242
}
4343

4444
}

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/AlertHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public AlertSerializer getSerializer(AlertMessage message) {
4141

4242
@Override
4343
protected void adjustTLSContext(AlertMessage message) {
44-
if (tlsContext.getTalkingConnectionEnd() == tlsContext.getConfig().getConnectionEnd()
44+
if (tlsContext.getTalkingConnectionEndType() == tlsContext.getConfig().getConnectionEndType()
4545
&& AlertLevel.FATAL.getValue() == message.getLevel().getValue()) {
4646
LOGGER.debug("Setting received Fatal Alert in Context");
4747
tlsContext.setReceivedFatalAlert(true);

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import de.rub.nds.tlsattacker.core.protocol.preparator.CertificateMessagePreparator;
1616
import de.rub.nds.tlsattacker.core.protocol.serializer.CertificateMessageSerializer;
1717
import de.rub.nds.tlsattacker.core.workflow.TlsContext;
18-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
18+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
1919
import java.io.ByteArrayInputStream;
2020
import java.io.IOException;
2121
import java.security.PublicKey;
@@ -51,7 +51,7 @@ public CertificateMessageSerializer getSerializer(CertificateMessage message) {
5151
protected void adjustTLSContext(CertificateMessage message) {
5252
Certificate cert = parseCertificate(message.getCertificatesLength().getValue(), message
5353
.getX509CertificateBytes().getValue());
54-
if (tlsContext.getTalkingConnectionEnd() == ConnectionEnd.CLIENT) {
54+
if (tlsContext.getTalkingConnectionEndType() == ConnectionEndType.CLIENT) {
5555
LOGGER.debug("Setting ClientCertificate in Context");
5656
tlsContext.setClientCertificate(cert);
5757
if (cert != null) {

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/ChangeCipherSpecHandler.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
import de.rub.nds.tlsattacker.core.record.cipher.RecordCipher;
1616
import de.rub.nds.tlsattacker.core.record.cipher.RecordCipherFactory;
1717
import de.rub.nds.tlsattacker.core.workflow.TlsContext;
18-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
19-
import org.apache.logging.log4j.LogManager;
20-
import org.apache.logging.log4j.Logger;
18+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
2119

2220
/**
2321
* @author Juraj Somorovsky <juraj.somorovsky@rub.de>
@@ -46,11 +44,11 @@ public ChangeCipherSpecSerializer getSerializer(ChangeCipherSpecMessage message)
4644

4745
@Override
4846
protected void adjustTLSContext(ChangeCipherSpecMessage message) {
49-
if (tlsContext.getTalkingConnectionEnd() == ConnectionEnd.CLIENT) {
47+
if (tlsContext.getTalkingConnectionEndType() == ConnectionEndType.CLIENT) {
5048
setRecordCipher();
5149
}
5250

53-
if (tlsContext.getTalkingConnectionEnd() != tlsContext.getConfig().getConnectionEnd()) {
51+
if (tlsContext.getTalkingConnectionEndType() != tlsContext.getConfig().getConnectionEndType()) {
5452
tlsContext.getRecordLayer().updateDecryptionCipher();
5553
}
5654
}

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/extension/ECPointFormatExtensionHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import de.rub.nds.tlsattacker.core.protocol.serializer.extension.ECPointFormatExtensionSerializer;
1818
import de.rub.nds.tlsattacker.core.protocol.serializer.extension.ExtensionSerializer;
1919
import de.rub.nds.tlsattacker.core.workflow.TlsContext;
20-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
20+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
2121
import java.util.LinkedList;
2222
import java.util.List;
2323

@@ -42,7 +42,7 @@ public void adjustTLSContext(ECPointFormatExtensionMessage message) {
4242
LOGGER.warn("Unknown ECPointFormat:" + b);
4343
}
4444
}
45-
if (context.getTalkingConnectionEnd() == ConnectionEnd.CLIENT) {
45+
if (context.getTalkingConnectionEndType() == ConnectionEndType.CLIENT) {
4646
context.setClientPointFormatsList(formatList);
4747
} else {
4848
context.setServerPointFormatsList(formatList);

‎TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/extension/ExtendedMasterSecretExtensionHandler.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import de.rub.nds.tlsattacker.core.protocol.preparator.extension.ExtendedMasterSecretExtensionPreparator;
1414
import de.rub.nds.tlsattacker.core.protocol.serializer.extension.ExtendedMasterSecretExtensionSerializer;
1515
import de.rub.nds.tlsattacker.core.workflow.TlsContext;
16-
import de.rub.nds.tlsattacker.transport.ConnectionEnd;
16+
import de.rub.nds.tlsattacker.transport.ConnectionEndType;
1717

1818
/**
1919
*
@@ -47,7 +47,8 @@ public ExtendedMasterSecretExtensionSerializer getSerializer(ExtendedMasterSecre
4747
*/
4848
@Override
4949
public void adjustTLSContext(ExtendedMasterSecretExtensionMessage message) {
50-
if (context.getTalkingConnectionEnd() == ConnectionEnd.SERVER || context.getConfig().isEnforceSettings()) {
50+
if (context.getTalkingConnectionEndType() == ConnectionEndType.SERVER
51+
|| context.getConfig().isEnforceSettings()) {
5152
context.setIsExtendedMasterSecretExtension(true);
5253
}
5354
}

0 commit comments

Comments
 (0)