Skip to content

Commit 9e5cd5a

Browse files
committed
removed general delegate from client and server command config as the new version of jcommander complains if the child class has the same delegate
1 parent 6286cfa commit 9e5cd5a

File tree

4 files changed

+2
-8
lines changed

4 files changed

+2
-8
lines changed

TLS-Client/src/main/java/de/rub/nds/tlsattacker/client/config/ClientCommandConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ public class ClientCommandConfig extends TLSDelegateConfig {
3737

3838
public static final String COMMAND = "client";
3939

40-
@ParametersDelegate
41-
private GeneralDelegate generalDelegate;
4240
@ParametersDelegate
4341
private CiphersuiteDelegate ciphersuiteDelegate;
4442
@ParametersDelegate
@@ -78,7 +76,6 @@ public class ClientCommandConfig extends TLSDelegateConfig {
7876

7977
public ClientCommandConfig(GeneralDelegate delegate) {
8078
super(delegate);
81-
generalDelegate = delegate;
8279
this.ciphersuiteDelegate = new CiphersuiteDelegate();
8380
this.maxFragmentLengthDelegate = new MaxFragmentLengthDelegate();
8481
this.ellipticCurveDelegate = new NamedGroupsDelegate();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class ListDelegate extends Delegate {
2929

3030
// Setting help=true allows us to surpass any parameters marked as required.
31-
@Parameter(names = "-list", description = "Plot a list of available parameters", help = true, converter = ListDelegateConverter.class)
31+
@Parameter(names = "-list", description = "Plot a list of available parameters", converter = ListDelegateConverter.class)
3232
private ListDelegateType listDelegateType = null;
3333

3434
public ListDelegate() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class WorkflowInputDelegate extends Delegate {
1717

18-
@Parameter(names = "-workflow_input", help = true, description = "This parameter allows you to load the whole workflow trace from the specified XML configuration file")
18+
@Parameter(names = "-workflow_input", description = "This parameter allows you to load the whole workflow trace from the specified XML configuration file")
1919
private String workflowInput = null;
2020

2121
public WorkflowInputDelegate() {

TLS-Server/src/main/java/de/rub/nds/tlsattacker/server/config/ServerCommandConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public class ServerCommandConfig extends TLSDelegateConfig {
3636

3737
public static final String COMMAND = "server";
3838

39-
@ParametersDelegate
40-
private GeneralDelegate generalDelegate;
4139
@ParametersDelegate
4240
private CiphersuiteDelegate ciphersuiteDelegate;
4341
@ParametersDelegate
@@ -75,7 +73,6 @@ public class ServerCommandConfig extends TLSDelegateConfig {
7573

7674
public ServerCommandConfig(GeneralDelegate delegate) {
7775
super(delegate);
78-
this.generalDelegate = delegate;
7976
this.ciphersuiteDelegate = new CiphersuiteDelegate();
8077
this.heartbeatDelegate = new HeartbeatDelegate();
8178
this.ellipticCurveDelegate = new NamedGroupsDelegate();

0 commit comments

Comments
 (0)