Merge pull request #676 from RUB-NDS/java-11-compatibility

update deps and plugins; java 11 compatibility

Author: ic0ns

.travis.yml

@@ -1,18 +1,44 @@
 language: java
 
-sudo: false
+os: linux
+dist: bionic
+script: mvn clean test
 
-script: mvn clean package -Dmaven.javadoc.skip=true
+stages:
+  - name: test
+  - name: package
+    if: branch = master
 
-jdk:
-  - oraclejdk8
-  - openjdk8
+jobs:
+  include:
+    - stage: test
+      name: "Test against OracleJDK 8 @ Ubuntu Trusty (14.04)"
+      jdk: oraclejdk8
+      dist: trusty
 
-branches:
-  only:
-    - master
+    - stage: test
+      name: "Test against OracleJDK 11 @ Ubuntu Bionic (18.04)"
+      jdk: oraclejdk11
+      dist: bionic
+
+    - stage: test
+      name: "Test against OpenJDK 8 @ Ubuntu Bionic (18.04)"
+      jdk: openjdk8
+      dist: bionic
+
+    - stage: test
+      name: "Test against OpenJDK 11 @ Ubuntu Bionic (18.04)"
+      jdk: openjdk11
+      dist: bionic
+
+    - stage: package
+      name: "Packaging JARs"
+      jdk: openjdk11
+      script: mvn clean package -Dmaven.javadoc.skip=true
 
 notifications:
   email:
+    if: branch = master
     recipients:
-    - juraj.somorovsky@hackmanit.de
+      - juraj.somorovsky@hackmanit.de
+

Attacks/nb-configuration.xml

@@ -22,6 +22,5 @@
         <de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterEnabled>true</de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterEnabled>
         <de-markiewb-netbeans-plugins-eclipse-formatter.enableFormatAsSaveAction>false</de-markiewb-netbeans-plugins-eclipse-formatter.enableFormatAsSaveAction>
         <de-markiewb-netbeans-plugins-eclipse-formatter.useProjectSettings>true</de-markiewb-netbeans-plugins-eclipse-formatter.useProjectSettings>
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

Attacks/pom.xml

@@ -16,11 +16,11 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>Attacks</finalName>              
+        <finalName>Attacks</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -44,7 +44,7 @@
                 <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -62,8 +62,8 @@
         </plugins>
     </build>
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <main.basedir>${project.parent.basedir}</main.basedir>
     </properties>
 </project>

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

@@ -10,6 +10,8 @@
 package de.rub.nds.tlsattacker.attacks;
 
 import com.beust.jcommander.JCommander;
+import com.beust.jcommander.JCommander.Builder;
+import com.beust.jcommander.ParameterException;
 import de.rub.nds.tlsattacker.attacks.config.*;
 import de.rub.nds.tlsattacker.attacks.config.delegate.GeneralAttackDelegate;
 import de.rub.nds.tlsattacker.attacks.impl.*;
@@ -35,53 +37,81 @@ public class Main {
      */
     public static void main(String[] args) {
         GeneralDelegate generalDelegate = new GeneralAttackDelegate();
-        JCommander jc = new JCommander(generalDelegate);
+        Builder builder = JCommander.newBuilder().addObject(generalDelegate);
+
         BleichenbacherCommandConfig bleichenbacherTest = new BleichenbacherCommandConfig(generalDelegate);
-        jc.addCommand(BleichenbacherCommandConfig.ATTACK_COMMAND, bleichenbacherTest);
+        builder.addCommand(BleichenbacherCommandConfig.ATTACK_COMMAND, bleichenbacherTest);
 
         PskBruteForcerAttackServerCommandConfig pskBruteForcerAttackServerTest = new PskBruteForcerAttackServerCommandConfig(
                 generalDelegate);
-        jc.addCommand(PskBruteForcerAttackServerCommandConfig.ATTACK_COMMAND, pskBruteForcerAttackServerTest);
+        builder.addCommand(PskBruteForcerAttackServerCommandConfig.ATTACK_COMMAND, pskBruteForcerAttackServerTest);
 
         PskBruteForcerAttackClientCommandConfig pskBruteForcerAttackClientTest = new PskBruteForcerAttackClientCommandConfig(
                 generalDelegate);
-        jc.addCommand(PskBruteForcerAttackClientCommandConfig.ATTACK_COMMAND, pskBruteForcerAttackClientTest);
+        builder.addCommand(PskBruteForcerAttackClientCommandConfig.ATTACK_COMMAND, pskBruteForcerAttackClientTest);
+
         InvalidCurveAttackConfig ellipticTest = new InvalidCurveAttackConfig(generalDelegate);
-        jc.addCommand(InvalidCurveAttackConfig.ATTACK_COMMAND, ellipticTest);
+        builder.addCommand(InvalidCurveAttackConfig.ATTACK_COMMAND, ellipticTest);
+
         HeartbleedCommandConfig heartbleed = new HeartbleedCommandConfig(generalDelegate);
-        jc.addCommand(HeartbleedCommandConfig.ATTACK_COMMAND, heartbleed);
+        builder.addCommand(HeartbleedCommandConfig.ATTACK_COMMAND, heartbleed);
 
         Lucky13CommandConfig lucky13 = new Lucky13CommandConfig(generalDelegate);
-        jc.addCommand(Lucky13CommandConfig.ATTACK_COMMAND, lucky13);
+        builder.addCommand(Lucky13CommandConfig.ATTACK_COMMAND, lucky13);
 
         PaddingOracleCommandConfig paddingOracle = new PaddingOracleCommandConfig(generalDelegate);
-        jc.addCommand(PaddingOracleCommandConfig.ATTACK_COMMAND, paddingOracle);
+        builder.addCommand(PaddingOracleCommandConfig.ATTACK_COMMAND, paddingOracle);
+
         TLSPoodleCommandConfig tlsPoodle = new TLSPoodleCommandConfig(generalDelegate);
-        jc.addCommand(TLSPoodleCommandConfig.ATTACK_COMMAND, tlsPoodle);
+        builder.addCommand(TLSPoodleCommandConfig.ATTACK_COMMAND, tlsPoodle);
+
         Cve20162107CommandConfig cve20162107 = new Cve20162107CommandConfig(generalDelegate);
-        jc.addCommand(Cve20162107CommandConfig.ATTACK_COMMAND, cve20162107);
+        builder.addCommand(Cve20162107CommandConfig.ATTACK_COMMAND, cve20162107);
+
         EarlyCCSCommandConfig earlyCCS = new EarlyCCSCommandConfig(generalDelegate);
-        jc.addCommand(EarlyCCSCommandConfig.ATTACK_COMMAND, earlyCCS);
+        builder.addCommand(EarlyCCSCommandConfig.ATTACK_COMMAND, earlyCCS);
+
         EarlyFinishedCommandConfig earlyFin = new EarlyFinishedCommandConfig(generalDelegate);
-        jc.addCommand(EarlyFinishedCommandConfig.ATTACK_COMMAND, earlyFin);
+        builder.addCommand(EarlyFinishedCommandConfig.ATTACK_COMMAND, earlyFin);
+
         PoodleCommandConfig poodle = new PoodleCommandConfig(generalDelegate);
-        jc.addCommand(PoodleCommandConfig.ATTACK_COMMAND, poodle);
+        builder.addCommand(PoodleCommandConfig.ATTACK_COMMAND, poodle);
+
         SimpleMitmProxyCommandConfig simpleMitmProxy = new SimpleMitmProxyCommandConfig(generalDelegate);
-        jc.addCommand(SimpleMitmProxyCommandConfig.ATTACK_COMMAND, simpleMitmProxy);
+        builder.addCommand(SimpleMitmProxyCommandConfig.ATTACK_COMMAND, simpleMitmProxy);
+
         GeneralDrownCommandConfig generalDrownConfig = new GeneralDrownCommandConfig(generalDelegate);
-        jc.addCommand(GeneralDrownCommandConfig.COMMAND, generalDrownConfig);
+        builder.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) {
-                jc.usage();
+        builder.addCommand(SpecialDrownCommandConfig.COMMAND, specialDrownConfig);
+
+        JCommander jc = builder.build();
+
+        try {
+            jc.parse(args);
+        } catch (ParameterException ex) {
+            String parsedCommand = ex.getJCommander().getParsedCommand();
+            if (parsedCommand != null) {
+                ex.getJCommander().getUsageFormatter().usage(parsedCommand);
             } else {
-                jc.usage(jc.getParsedCommand());
+                ex.usage();
             }
             return;
         }
+
+        if (jc.getParsedCommand() == null) {
+            jc.usage();
+            return;
+        }
+
+        if (generalDelegate.isHelp()) {
+            jc.getUsageFormatter().usage(jc.getParsedCommand());
+            return;
+        }
+
         Attacker<? extends TLSDelegateConfig> attacker = null;
+
         switch (jc.getParsedCommand()) {
             case BleichenbacherCommandConfig.ATTACK_COMMAND:
                 attacker = new BleichenbacherAttacker(bleichenbacherTest, bleichenbacherTest.createConfig());
@@ -131,41 +161,28 @@ public static void main(String[] args) {
                 attacker = new SpecialDrownAttacker(specialDrownConfig, specialDrownConfig.createConfig());
                 break;
             default:
-                throw new ConfigurationException("Command not found");
+                break;
         }
+
         if (attacker == null) {
-            throw new ConfigurationException("Attacker not found");
+            throw new ConfigurationException("Command not found");
         }
-        if (isPrintHelpForCommand(jc, attacker.getConfig())) {
-            jc.usage(jc.getParsedCommand());
-        } else {
 
-            if (attacker.getConfig().isExecuteAttack()) {
-                attacker.attack();
-            } else {
-                try {
-                    Boolean result = attacker.checkVulnerability();
-                    if (Objects.equals(result, Boolean.TRUE)) {
-                        CONSOLE.error("Vulnerable:" + result.toString());
-                    } else if (Objects.equals(result, Boolean.FALSE)) {
-                        CONSOLE.info("Vulnerable:" + result.toString());
-                    } else {
-                        CONSOLE.warn("Vulnerable: Uncertain");
-                    }
-                } catch (UnsupportedOperationException E) {
-                    LOGGER.info("The selected attacker is currently not implemented");
+        if (attacker.getConfig().isExecuteAttack()) {
+            attacker.attack();
+        } else {
+            try {
+                Boolean result = attacker.checkVulnerability();
+                if (Objects.equals(result, Boolean.TRUE)) {
+                    CONSOLE.error("Vulnerable:" + result.toString());
+                } else if (Objects.equals(result, Boolean.FALSE)) {
+                    CONSOLE.info("Vulnerable:" + result.toString());
+                } else {
+                    CONSOLE.warn("Vulnerable: Uncertain");
                 }
+            } catch (UnsupportedOperationException E) {
+                LOGGER.info("The selected attacker is currently not implemented");
             }
         }
     }
-
-    /**
-     *
-     * @param jc
-     * @param config
-     * @return
-     */
-    public static boolean isPrintHelpForCommand(JCommander jc, TLSDelegateConfig config) {
-        return config.getGeneralDelegate().isHelp();
-    }
 }

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

@@ -26,8 +26,6 @@
 import de.rub.nds.x509attacker.xmlsignatureengine.XmlSignatureEngine;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import sun.security.rsa.RSAPrivateCrtKeyImpl;
-import sun.security.rsa.RSAPublicKeyImpl;
 
 import javax.crypto.interfaces.DHPrivateKey;
 import javax.crypto.interfaces.DHPublicKey;
@@ -45,6 +43,8 @@
 import java.security.interfaces.DSAPublicKey;
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.ECPublicKey;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
 import java.security.spec.ECPoint;
 import java.util.HashMap;
 import java.util.List;
@@ -211,7 +211,7 @@ private String replacePlaceholders(String xmlString, String rootCertificateKeyNa
      * This is a wrapper function to write a generated certificate chain to
      * disk. This is needed since X.509-Attacker still uses a two dimensional
      * byte array for encoded certificates rather than a LinkedList.
-     * 
+     *
      * @param outputDirectory
      * @param certificates
      * @param ccaCertificateChain
@@ -232,7 +232,7 @@ private void saveCertificateChainToFile(String outputDirectory, List<Asn1Encodab
     /**
      * Based on the provided parameters this function adds the correct Custom
      * Private/Public Keys to the certificate chain.
-     * 
+     *
      * @param ccaCertificateChain
      * @param keyName
      * @param pubKeyName
@@ -254,15 +254,14 @@ private boolean setLeafCertificateKeys(CcaCertificateChain ccaCertificateChain,
                     keyBytes = keyFileManager.getKeyFileContent(keyName);
 
                     privateKey = readPrivateKey(new ByteArrayInputStream(keyBytes));
-                    BigInteger modulus = ((RSAPrivateCrtKeyImpl) privateKey).getModulus();
-                    BigInteger d = ((RSAPrivateCrtKeyImpl) privateKey).getPrivateExponent();
+                    BigInteger modulus = ((RSAPrivateKey) privateKey).getModulus();
+                    BigInteger d = ((RSAPrivateKey) privateKey).getPrivateExponent();
                     customPrivateKey = new CustomRSAPrivateKey(modulus, d);
 
                     pubKeyBytes = keyFileManager.getKeyFileContent(pubKeyName);
 
                     PublicKey publicKey = PemUtil.readPublicKey(new ByteArrayInputStream(pubKeyBytes));
-                    customPublicKey = new CustomRsaPublicKey(((RSAPublicKeyImpl) publicKey).getPublicExponent(),
-                            modulus);
+                    customPublicKey = new CustomRsaPublicKey(((RSAPublicKey) publicKey).getPublicExponent(), modulus);
                     break;
                 case DH:
                     keyBytes = keyFileManager.getKeyFileContent(keyName);

TLS-Client/pom.xml

@@ -10,13 +10,13 @@
     <artifactId>TLS-Client</artifactId>
     <packaging>jar</packaging>
     <build>
-        <finalName>TLS-Client</finalName>              
+        <finalName>TLS-Client</finalName>
         <plugins>
             <plugin>
                 <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -29,7 +29,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -65,8 +65,8 @@
         </dependency>
     </dependencies>
     <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <main.basedir>${project.parent.basedir}</main.basedir>
     </properties>
 </project>

TLS-Core/nb-configuration.xml

@@ -8,7 +8,7 @@
     -->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
         <!--
-        Properties that influence various parts of the IDE, especially code formatting and the like. 
+        Properties that influence various parts of the IDE, especially code formatting and the like.
         You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
         That way multiple projects can share the same settings (useful for formatting rules for example).
         Any value defined here will override the pom.xml file value but is only applicable to the current project.
@@ -22,7 +22,6 @@
         <de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterEnabled>true</de-markiewb-netbeans-plugins-eclipse-formatter.eclipseFormatterEnabled>
         <de-markiewb-netbeans-plugins-eclipse-formatter.enableFormatAsSaveAction>false</de-markiewb-netbeans-plugins-eclipse-formatter.enableFormatAsSaveAction>
         <de-markiewb-netbeans-plugins-eclipse-formatter.useProjectSettings>true</de-markiewb-netbeans-plugins-eclipse-formatter.useProjectSettings>
-        <netbeans.hint.jdkPlatform>JDK_1.8_Oracle</netbeans.hint.jdkPlatform>
         <netbeans.compile.on.save>all</netbeans.compile.on.save>
     </properties>
     <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">