Skip to content

Commit 380c63a

Browse files
authored
Merge pull request #413 from RUB-NDS/fuzzing_fixes
Fuzzing fixes
2 parents 9bb7938 + 41f968c commit 380c63a

File tree

402 files changed

+5149
-2976
lines changed

Some content is hidden

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

402 files changed

+5149
-2976
lines changed

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/Main.java

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

1111
import com.beust.jcommander.JCommander;
1212
import de.rub.nds.tlsattacker.attacks.config.BleichenbacherCommandConfig;
13-
import de.rub.nds.tlsattacker.attacks.config.PskBruteForcerAttackServerCommandConfig;
14-
import de.rub.nds.tlsattacker.attacks.config.PskBruteForcerAttackClientCommandConfig;
1513
import de.rub.nds.tlsattacker.attacks.config.Cve20162107CommandConfig;
1614
import de.rub.nds.tlsattacker.attacks.config.DrownCommandConfig;
1715
import de.rub.nds.tlsattacker.attacks.config.EarlyCCSCommandConfig;
1816
import de.rub.nds.tlsattacker.attacks.config.HeartbleedCommandConfig;
1917
import de.rub.nds.tlsattacker.attacks.config.InvalidCurveAttackConfig;
2018
import de.rub.nds.tlsattacker.attacks.config.PaddingOracleCommandConfig;
2119
import de.rub.nds.tlsattacker.attacks.config.PoodleCommandConfig;
20+
import de.rub.nds.tlsattacker.attacks.config.PskBruteForcerAttackClientCommandConfig;
21+
import de.rub.nds.tlsattacker.attacks.config.PskBruteForcerAttackServerCommandConfig;
2222
import de.rub.nds.tlsattacker.attacks.config.SimpleMitmProxyCommandConfig;
2323
import de.rub.nds.tlsattacker.attacks.config.TLSPoodleCommandConfig;
2424
import de.rub.nds.tlsattacker.attacks.config.TooManyAlgorithmsAttackConfig;
2525
import de.rub.nds.tlsattacker.attacks.config.WinshockCommandConfig;
2626
import de.rub.nds.tlsattacker.attacks.config.delegate.GeneralAttackDelegate;
2727
import de.rub.nds.tlsattacker.attacks.impl.Attacker;
2828
import de.rub.nds.tlsattacker.attacks.impl.BleichenbacherAttacker;
29-
import de.rub.nds.tlsattacker.attacks.impl.PskBruteForcerAttackServer;
30-
import de.rub.nds.tlsattacker.attacks.impl.PskBruteForcerAttackClient;
3129
import de.rub.nds.tlsattacker.attacks.impl.Cve20162107Attacker;
3230
import de.rub.nds.tlsattacker.attacks.impl.DrownAttacker;
3331
import de.rub.nds.tlsattacker.attacks.impl.EarlyCCSAttacker;
3432
import de.rub.nds.tlsattacker.attacks.impl.HeartbleedAttacker;
3533
import de.rub.nds.tlsattacker.attacks.impl.InvalidCurveAttacker;
3634
import de.rub.nds.tlsattacker.attacks.impl.PaddingOracleAttacker;
3735
import de.rub.nds.tlsattacker.attacks.impl.PoodleAttacker;
36+
import de.rub.nds.tlsattacker.attacks.impl.PskBruteForcerAttackClient;
37+
import de.rub.nds.tlsattacker.attacks.impl.PskBruteForcerAttackServer;
3838
import de.rub.nds.tlsattacker.attacks.impl.SimpleMitmProxy;
3939
import de.rub.nds.tlsattacker.attacks.impl.TLSPoodleAttacker;
4040
import de.rub.nds.tlsattacker.attacks.impl.TooManyAlgorithmsAttacker;

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

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

11-
/**
12-
*
13-
* @author Robert Merget <robert.merget@rub.de>
14-
*/
1511
public enum GuessProviderType {
1612
INCREMENTING,
1713
WORDLIST

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
1919
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
2020
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
21-
import de.rub.nds.tlsattacker.transport.TransportHandlerType;
2221
import java.util.Collections;
2322
import java.util.LinkedList;
2423
import java.util.List;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
1616
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1717
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
18-
import de.rub.nds.tlsattacker.transport.TransportHandlerType;
1918

2019
public class EarlyCCSCommandConfig extends AttackConfig {
2120
public static final String ATTACK_COMMAND = "early_ccs";

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1818
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
1919
import de.rub.nds.tlsattacker.core.constants.HeartbeatMode;
20-
import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
2120

2221
public class HeartbleedCommandConfig extends AttackConfig {
2322

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.math.BigInteger;
2727
import java.util.LinkedList;
2828
import java.util.List;
29-
import org.apache.logging.log4j.Level;
30-
import org.apache.logging.log4j.core.config.Configurator;
3129

3230
public class InvalidCurveAttackConfig extends AttackConfig {
3331

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
1818
import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
1919
import de.rub.nds.tlsattacker.core.config.delegate.ServerDelegate;
20-
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
21-
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
2220
import java.io.File;
2321
import java.io.FileInputStream;
2422
import java.io.FileNotFoundException;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@
2222
import java.util.LinkedList;
2323
import java.util.List;
2424
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
25-
import java.io.BufferedReader;
2625
import java.io.File;
27-
import java.io.InputStreamReader;
2826
import java.io.FileInputStream;
2927
import java.io.FileNotFoundException;
3028
import java.io.InputStream;
31-
import java.util.Scanner;
3229

3330
public class PskBruteForcerAttackServerCommandConfig extends AttackConfig {
3431

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/connectivity/ConnectivityChecker.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
import java.io.IOException;
1717
import org.apache.logging.log4j.LogManager;
1818

19-
/**
20-
*
21-
* @author Robert Merget <robert.merget@rub.de>
22-
*/
2319
public class ConnectivityChecker {
2420

2521
private final Connection connection;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/constants/DrownVulnerabilityType.java

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

11-
/**
12-
*
13-
* @author Robert Merget <robert.merget@rub.de>
14-
*/
1511
public enum DrownVulnerabilityType {
1612
FULL,
1713
SSL2,

0 commit comments

Comments
 (0)