Merge branch 'master' into timing-fixes2

Author: ic0ns

.gitignore

@@ -1,3 +1,4 @@
+*.iml
 target/
 pom.xml.tag
 pom.xml.releaseBackup
@@ -44,3 +45,5 @@ Utils/.settings/org.eclipse.jdt.core.prefs
 test.sh
 .settings/
 .classpath
+.idea
+*.iml

Attacks/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.4.0</version>
+        <version>3.5.0</version>
     </parent>
     <artifactId>Attacks</artifactId>
     <packaging>jar</packaging>

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

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0
@@ -12,6 +13,7 @@
 import de.rub.nds.tlsattacker.attacks.config.*;
 import de.rub.nds.tlsattacker.attacks.config.delegate.GeneralAttackDelegate;
 import de.rub.nds.tlsattacker.attacks.impl.*;
+import de.rub.nds.tlsattacker.attacks.impl.drown.*;
 import de.rub.nds.tlsattacker.core.config.TLSDelegateConfig;
 import de.rub.nds.tlsattacker.core.config.delegate.GeneralDelegate;
 import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
@@ -66,8 +68,10 @@ public static void main(String[] args) {
         jc.addCommand(PoodleCommandConfig.ATTACK_COMMAND, poodle);
         SimpleMitmProxyCommandConfig simpleMitmProxy = new SimpleMitmProxyCommandConfig(generalDelegate);
         jc.addCommand(SimpleMitmProxyCommandConfig.ATTACK_COMMAND, simpleMitmProxy);
-        DrownCommandConfig drownConfig = new DrownCommandConfig(generalDelegate);
-        jc.addCommand(DrownCommandConfig.COMMAND, drownConfig);
+        GeneralDrownCommandConfig generalDrownConfig = new GeneralDrownCommandConfig(generalDelegate);
+        jc.addCommand(GeneralDrownCommandConfig.COMMAND, generalDrownConfig);
+        SpecialDrownCommandConfig specialDrownConfig = new SpecialDrownCommandConfig(generalDelegate);
+        jc.addCommand(SpecialDrownCommandConfig.COMMAND, specialDrownConfig);
         jc.parse(args);
         if (generalDelegate.isHelp() || jc.getParsedCommand() == null) {
             if (jc.getParsedCommand() == null) {
@@ -120,8 +124,11 @@ public static void main(String[] args) {
                 attacker = new PskBruteForcerAttackServer(pskBruteForcerAttackServerTest,
                         pskBruteForcerAttackServerTest.createConfig());
                 break;
-            case DrownCommandConfig.COMMAND:
-                attacker = new DrownAttacker(drownConfig, drownConfig.createConfig());
+            case GeneralDrownCommandConfig.COMMAND:
+                attacker = new GeneralDrownAttacker(generalDrownConfig, generalDrownConfig.createConfig());
+                break;
+            case SpecialDrownCommandConfig.COMMAND:
+                attacker = new SpecialDrownAttacker(specialDrownConfig, specialDrownConfig.createConfig());
                 break;
             default:
                 throw new ConfigurationException("Command not found");

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/actions/EarlyCcsAction.java

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0

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

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0

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

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0

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

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0

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

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0

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

@@ -1,7 +1,8 @@
 /**
  * TLS-Attacker - A Modular Penetration Testing Framework for TLS
  *
- * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
  *
  * Licensed under Apache License 2.0
  * http://www.apache.org/licenses/LICENSE-2.0

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/cca/CcaCertificateChain.java

@@ -0,0 +1,54 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2020 Ruhr University Bochum, Paderborn University,
+ * and Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.attacks.cca;
+
+import de.rub.nds.tlsattacker.core.crypto.keys.CustomPrivateKey;
+import de.rub.nds.tlsattacker.core.crypto.keys.CustomPublicKey;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class CcaCertificateChain {
+    private List<byte[]> encodedCertificates;
+    private CustomPrivateKey leafCertificatePrivateKey;
+    private CustomPublicKey leafCertificatePublicKey;
+
+    CcaCertificateChain() {
+        this.encodedCertificates = new LinkedList<>();
+    }
+
+    public void appendEncodedCertificate(byte[] encodedCertificate) {
+        encodedCertificates.add(encodedCertificate);
+    }
+
+    public void setLeafCertificatePrivateKey(CustomPrivateKey leafCertificatePrivateKey) {
+        this.leafCertificatePrivateKey = leafCertificatePrivateKey;
+    }
+
+    public CustomPrivateKey getLeafCertificatePrivateKey() {
+        return leafCertificatePrivateKey;
+    }
+
+    public void setLeafCertificatePublicKey(CustomPublicKey leafCertificatePublicKey) {
+        this.leafCertificatePublicKey = leafCertificatePublicKey;
+    }
+
+    public CustomPublicKey getLeafCertificatePublicKey() {
+        return leafCertificatePublicKey;
+    }
+
+    public List<byte[]> getEncodedCertificates() {
+        return encodedCertificates;
+    }
+
+    public void setEncodedCertificates(List<byte[]> encodedCertificates) {
+        this.encodedCertificates = encodedCertificates;
+    }
+}