Skip to content

Commit 906af93

Browse files
ic0nsic0ns
authored
Merge branch 'master' into supplementalDataAddition
2 parents 97fe311 + fe5bf47 commit 906af93

File tree

416 files changed

+7378
-4528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

416 files changed

+7378
-4528
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ Utils/.settings/org.eclipse.core.resources.prefs
4242
Utils/.settings/org.eclipse.jdt.core.prefs
4343
.project
4444
test.sh
45+
.settings/
46+
.classpath

‎Attacks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.rub.nds.tlsattacker</groupId>
66
<artifactId>TLS-Attacker</artifactId>
7-
<version>3.0</version>
7+
<version>3.2</version>
88
</parent>
99
<artifactId>Attacks</artifactId>
1010
<packaging>jar</packaging>

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/bruteforce/IncrementingGuessProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public IncrementingGuessProvider() {
2929

3030
/**
3131
* Returns the last Guess incremented by 1.
32-
*
32+
*
3333
* @return
3434
*/
3535
@Override

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/BleichenbacherCommandConfig.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1717
import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
1818
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
19-
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
2019
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
2120
import de.rub.nds.tlsattacker.core.config.delegate.StarttlsDelegate;
2221
import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
@@ -38,8 +37,6 @@ public class BleichenbacherCommandConfig extends AttackConfig {
3837
@ParametersDelegate
3938
private ClientDelegate clientDelegate;
4039
@ParametersDelegate
41-
private HostnameExtensionDelegate hostnameExtensionDelegate;
42-
@ParametersDelegate
4340
private CiphersuiteDelegate ciphersuiteDelegate;
4441
@ParametersDelegate
4542
private ProtocolVersionDelegate protocolVersionDelegate;
@@ -70,13 +67,11 @@ public class BleichenbacherCommandConfig extends AttackConfig {
7067
public BleichenbacherCommandConfig(GeneralDelegate delegate) {
7168
super(delegate);
7269
clientDelegate = new ClientDelegate();
73-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
7470
ciphersuiteDelegate = new CiphersuiteDelegate();
7571
protocolVersionDelegate = new ProtocolVersionDelegate();
7672
attackDelegate = new AttackDelegate();
7773
starttlsDelegate = new StarttlsDelegate();
7874
addDelegate(clientDelegate);
79-
addDelegate(hostnameExtensionDelegate);
8075
addDelegate(ciphersuiteDelegate);
8176
addDelegate(protocolVersionDelegate);
8277
addDelegate(attackDelegate);

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/Cve20162107CommandConfig.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1515
import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
1616
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
17-
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1817
import de.rub.nds.tlsattacker.core.config.delegate.StarttlsDelegate;
1918
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
2019
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
@@ -40,8 +39,6 @@ public class Cve20162107CommandConfig extends AttackConfig {
4039
@ParametersDelegate
4140
private CiphersuiteDelegate cipherSuiteDelegate;
4241
@ParametersDelegate
43-
private HostnameExtensionDelegate hostnameExtensionDelegate;
44-
@ParametersDelegate
4542
private StarttlsDelegate starttlsDelegate;
4643

4744
/**
@@ -56,11 +53,9 @@ public Cve20162107CommandConfig(GeneralDelegate delegate) {
5653
versions.add(ProtocolVersion.TLS12);
5754
clientDelegate = new ClientDelegate();
5855
cipherSuiteDelegate = new CiphersuiteDelegate();
59-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
6056
starttlsDelegate = new StarttlsDelegate();
6157
addDelegate(clientDelegate);
6258
addDelegate(cipherSuiteDelegate);
63-
addDelegate(hostnameExtensionDelegate);
6459
addDelegate(starttlsDelegate);
6560

6661
}

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/EarlyCCSCommandConfig.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1414
import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
1515
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
16-
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1716
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
1817
import de.rub.nds.tlsattacker.core.config.delegate.StarttlsDelegate;
1918
import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
@@ -33,8 +32,6 @@ public class EarlyCCSCommandConfig extends AttackConfig {
3332
@ParametersDelegate
3433
private ClientDelegate clientDelegate;
3534
@ParametersDelegate
36-
private HostnameExtensionDelegate hostnameExtensionDelegate;
37-
@ParametersDelegate
3835
private CiphersuiteDelegate ciphersuiteDelegate;
3936
@ParametersDelegate
4037
private ProtocolVersionDelegate protocolVersionDelegate;
@@ -48,12 +45,10 @@ public class EarlyCCSCommandConfig extends AttackConfig {
4845
public EarlyCCSCommandConfig(GeneralDelegate delegate) {
4946
super(delegate);
5047
clientDelegate = new ClientDelegate();
51-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
5248
ciphersuiteDelegate = new CiphersuiteDelegate();
5349
protocolVersionDelegate = new ProtocolVersionDelegate();
5450
starttlsDelegate = new StarttlsDelegate();
5551
addDelegate(clientDelegate);
56-
addDelegate(hostnameExtensionDelegate);
5752
addDelegate(ciphersuiteDelegate);
5853
addDelegate(protocolVersionDelegate);
5954
addDelegate(starttlsDelegate);

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/EarlyFinishedCommandConfig.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1515
import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
1616
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
17-
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1817
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
1918

2019
public class EarlyFinishedCommandConfig extends AttackConfig {
@@ -24,20 +23,16 @@ public class EarlyFinishedCommandConfig extends AttackConfig {
2423
@ParametersDelegate
2524
private ClientDelegate clientDelegate;
2625
@ParametersDelegate
27-
private HostnameExtensionDelegate hostnameExtensionDelegate;
28-
@ParametersDelegate
2926
private CiphersuiteDelegate ciphersuiteDelegate;
3027
@ParametersDelegate
3128
private ProtocolVersionDelegate protocolVersionDelegate;
3229

3330
public EarlyFinishedCommandConfig(GeneralDelegate delegate) {
3431
super(delegate);
3532
clientDelegate = new ClientDelegate();
36-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
3733
ciphersuiteDelegate = new CiphersuiteDelegate();
3834
protocolVersionDelegate = new ProtocolVersionDelegate();
3935
addDelegate(clientDelegate);
40-
addDelegate(hostnameExtensionDelegate);
4136
addDelegate(ciphersuiteDelegate);
4237
addDelegate(protocolVersionDelegate);
4338
}

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/HeartbleedCommandConfig.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1515
import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
1616
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
17-
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1817
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
1918
import de.rub.nds.tlsattacker.core.config.delegate.StarttlsDelegate;
2019
import de.rub.nds.tlsattacker.core.constants.AlgorithmResolver;
@@ -38,8 +37,6 @@ public class HeartbleedCommandConfig extends AttackConfig {
3837
@ParametersDelegate
3938
private ClientDelegate clientDelegate;
4039
@ParametersDelegate
41-
private HostnameExtensionDelegate hostnameExtensionDelegate;
42-
@ParametersDelegate
4340
private CiphersuiteDelegate ciphersuiteDelegate;
4441
@ParametersDelegate
4542
private ProtocolVersionDelegate protocolVersionDelegate;
@@ -53,12 +50,10 @@ public class HeartbleedCommandConfig extends AttackConfig {
5350
public HeartbleedCommandConfig(GeneralDelegate delegate) {
5451
super(delegate);
5552
clientDelegate = new ClientDelegate();
56-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
5753
ciphersuiteDelegate = new CiphersuiteDelegate();
5854
protocolVersionDelegate = new ProtocolVersionDelegate();
5955
starttlsDelegate = new StarttlsDelegate();
6056
addDelegate(clientDelegate);
61-
addDelegate(hostnameExtensionDelegate);
6257
addDelegate(ciphersuiteDelegate);
6358
addDelegate(protocolVersionDelegate);
6459
addDelegate(starttlsDelegate);

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/InvalidCurveAttackConfig.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1919
import de.rub.nds.tlsattacker.core.config.delegate.ClientDelegate;
2020
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
21-
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
2221
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
2322
import de.rub.nds.tlsattacker.core.config.delegate.StarttlsDelegate;
2423
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
@@ -74,9 +73,6 @@ public class InvalidCurveAttackConfig extends AttackConfig {
7473
@ParametersDelegate
7574
private ClientDelegate clientDelegate;
7675

77-
@ParametersDelegate
78-
private HostnameExtensionDelegate hostnameExtensionDelegate;
79-
8076
@ParametersDelegate
8177
private CiphersuiteDelegate ciphersuiteDelegate;
8278

@@ -96,13 +92,11 @@ public class InvalidCurveAttackConfig extends AttackConfig {
9692
public InvalidCurveAttackConfig(GeneralDelegate delegate) {
9793
super(delegate);
9894
clientDelegate = new ClientDelegate();
99-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
10095
ciphersuiteDelegate = new CiphersuiteDelegate();
10196
protocolVersionDelegate = new ProtocolVersionDelegate();
10297
attackDelegate = new AttackDelegate();
10398
starttlsDelegate = new StarttlsDelegate();
10499
addDelegate(clientDelegate);
105-
addDelegate(hostnameExtensionDelegate);
106100
addDelegate(ciphersuiteDelegate);
107101
addDelegate(protocolVersionDelegate);
108102
addDelegate(attackDelegate);
@@ -309,5 +303,4 @@ public Config createConfig() {
309303
config.setWorkflowTraceType(WorkflowTraceType.HANDSHAKE);
310304
return config;
311305
}
312-
313306
}

‎Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/Lucky13CommandConfig.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ public class Lucky13CommandConfig extends AttackConfig {
4444
@ParametersDelegate
4545
private ClientDelegate clientDelegate;
4646
@ParametersDelegate
47-
private HostnameExtensionDelegate hostnameExtensionDelegate;
48-
@ParametersDelegate
4947
private CiphersuiteDelegate ciphersuiteDelegate;
5048
@ParametersDelegate
5149
private ProtocolVersionDelegate protocolVersionDelegate;
@@ -61,13 +59,11 @@ public class Lucky13CommandConfig extends AttackConfig {
6159
public Lucky13CommandConfig(GeneralDelegate delegate) {
6260
super(delegate);
6361
clientDelegate = new ClientDelegate();
64-
hostnameExtensionDelegate = new HostnameExtensionDelegate();
6562
ciphersuiteDelegate = new CiphersuiteDelegate();
6663
protocolVersionDelegate = new ProtocolVersionDelegate();
6764
starttlsDelegate = new StarttlsDelegate();
6865
proxyDelegate = new ProxyDelegate();
6966
addDelegate(clientDelegate);
70-
addDelegate(hostnameExtensionDelegate);
7167
addDelegate(ciphersuiteDelegate);
7268
addDelegate(protocolVersionDelegate);
7369
addDelegate(starttlsDelegate);

0 commit comments

Comments
 (0)