Merge pull request #693 from RUB-NDS/jcommanderDoubleGeneralFix

removed general delegate from client and server command config as the…

Author: ic0ns

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

@@ -37,8 +37,6 @@ public class ClientCommandConfig extends TLSDelegateConfig {
 
     public static final String COMMAND = "client";
 
-    @ParametersDelegate
-    private GeneralDelegate generalDelegate;
     @ParametersDelegate
     private CiphersuiteDelegate ciphersuiteDelegate;
     @ParametersDelegate
@@ -78,7 +76,6 @@ public class ClientCommandConfig extends TLSDelegateConfig {
 
     public ClientCommandConfig(GeneralDelegate delegate) {
         super(delegate);
-        generalDelegate = delegate;
         this.ciphersuiteDelegate = new CiphersuiteDelegate();
         this.maxFragmentLengthDelegate = new MaxFragmentLengthDelegate();
         this.ellipticCurveDelegate = new NamedGroupsDelegate();

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

@@ -28,7 +28,7 @@
 public class ListDelegate extends Delegate {
 
     // Setting help=true allows us to surpass any parameters marked as required.
-    @Parameter(names = "-list", description = "Plot a list of available parameters", help = true, converter = ListDelegateConverter.class)
+    @Parameter(names = "-list", description = "Plot a list of available parameters", converter = ListDelegateConverter.class)
     private ListDelegateType listDelegateType = null;
 
     public ListDelegate() {

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

@@ -15,7 +15,7 @@
 
 public class WorkflowInputDelegate extends Delegate {
 
-    @Parameter(names = "-workflow_input", help = true, description = "This parameter allows you to load the whole workflow trace from the specified XML configuration file")
+    @Parameter(names = "-workflow_input", description = "This parameter allows you to load the whole workflow trace from the specified XML configuration file")
     private String workflowInput = null;
 
     public WorkflowInputDelegate() {

TLS-Mitm/src/main/java/de/rub/nds/tlsattacker/mitm/config/MitmCommandConfig.java

@@ -38,8 +38,6 @@ public class MitmCommandConfig extends TLSDelegateConfig {
 
     public static final String COMMAND = "mitm";
 
-    @ParametersDelegate
-    private GeneralDelegate generalDelegate;
     @ParametersDelegate
     private CiphersuiteDelegate ciphersuiteDelegate;
     @ParametersDelegate
@@ -77,7 +75,6 @@ public class MitmCommandConfig extends TLSDelegateConfig {
 
     public MitmCommandConfig(GeneralDelegate delegate) {
         super(delegate);
-        this.generalDelegate = delegate;
         this.ciphersuiteDelegate = new CiphersuiteDelegate();
         this.heartbeatDelegate = new HeartbeatDelegate();
         this.ellipticCurveDelegate = new NamedGroupsDelegate();

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

@@ -36,8 +36,6 @@ public class ServerCommandConfig extends TLSDelegateConfig {
 
     public static final String COMMAND = "server";
 
-    @ParametersDelegate
-    private GeneralDelegate generalDelegate;
     @ParametersDelegate
     private CiphersuiteDelegate ciphersuiteDelegate;
     @ParametersDelegate
@@ -75,7 +73,6 @@ public class ServerCommandConfig extends TLSDelegateConfig {
 
     public ServerCommandConfig(GeneralDelegate delegate) {
         super(delegate);
-        this.generalDelegate = delegate;
         this.ciphersuiteDelegate = new CiphersuiteDelegate();
         this.heartbeatDelegate = new HeartbeatDelegate();
         this.ellipticCurveDelegate = new NamedGroupsDelegate();

TraceTool/src/main/java/de/rub/nds/tlsattacker/tracetool/config/TraceToolCommandConfig.java

@@ -32,8 +32,6 @@ public class TraceToolCommandConfig extends TLSDelegateConfig {
 
     public static final String COMMAND = "tracetool";
 
-    @ParametersDelegate
-    private GeneralDelegate generalDelegate;
     @ParametersDelegate
     private ProtocolVersionDelegate protocolVersionDelegate;
     @ParametersDelegate
@@ -55,7 +53,6 @@ public class TraceToolCommandConfig extends TLSDelegateConfig {
 
     public TraceToolCommandConfig(GeneralDelegate delegate) {
         super(delegate);
-        this.generalDelegate = delegate;
         this.protocolVersionDelegate = new ProtocolVersionDelegate();
         this.workflowOutputDelegate = new WorkflowOutputDelegate();
         this.workflowInputDelegate = new WorkflowInputDelegate();