Merge pull request #379 from RUB-NDS/v21release

Added CiphersuiteDelegate to TraceTool

Author: ic0ns

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

@@ -2,7 +2,7 @@
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
  * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
- * 
+ *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  */
@@ -11,6 +11,7 @@
 import com.beust.jcommander.ParametersDelegate;
 import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.config.TLSDelegateConfig;
+import de.rub.nds.tlsattacker.core.config.delegate.CiphersuiteDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.ConfigOutputDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.FilterDelegate;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
@@ -25,6 +26,7 @@
 import org.apache.logging.log4j.Logger;
 
 public class TraceToolCommandConfig extends TLSDelegateConfig {
+
     protected static final Logger LOGGER = LogManager.getLogger(TraceToolCommandConfig.class);
 
     public static final String COMMAND = "tracetool";
@@ -47,6 +49,8 @@ public class TraceToolCommandConfig extends TLSDelegateConfig {
     private ListDelegate listDelegate;
     @ParametersDelegate
     private RunningModeDelegate runningModeDelegate;
+    @ParametersDelegate
+    private CiphersuiteDelegate ciphersuiteDelegate;
 
     public TraceToolCommandConfig(GeneralDelegate delegate) {
         super(delegate);
@@ -58,8 +62,10 @@ public TraceToolCommandConfig(GeneralDelegate delegate) {
         this.filterDelegate = new FilterDelegate();
         this.configOutputDelegate = new ConfigOutputDelegate();
         this.listDelegate = new ListDelegate();
+        this.ciphersuiteDelegate = new CiphersuiteDelegate();
         this.runningModeDelegate = new RunningModeDelegate();
         addDelegate(protocolVersionDelegate);
+        addDelegate(ciphersuiteDelegate);
         addDelegate(workflowInputDelegate);
         addDelegate(workflowOutputDelegate);
         addDelegate(workflowTypeDelegate);