Merge pull request #122 from tls-attacker/log4shellfix

updated dependencies to prevent log4shell
tls-attacker · Dec 17, 2021 · 9f686c1 · 9f686c1
2 parents 70f961d + ddf5469
commit 9f686c1
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 31 deletions.
diff --git a/Attacks/pom.xml b/Attacks/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>Attacks</artifactId>
     <packaging>jar</packaging>

diff --git a/TLS-Client/pom.xml b/TLS-Client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <name>TLS-Client</name>
     <artifactId>TLS-Client</artifactId>

diff --git a/TLS-Core/pom.xml b/TLS-Core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>TLS-Core</artifactId>
     <packaging>jar</packaging>

diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/config/delegate/ClientDelegateTest.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/config/delegate/ClientDelegateTest.java
@@ -71,26 +71,6 @@ public void testSetHost() {
         assertTrue(delegate.getHost().equals("123456"));
     }
 
-    /**
-     * Test of applyDelegate method, of class ClientDelegate.
-     */
-    @Test
-    public void testApplyDelegate() {
-        Config config = Config.createConfig();
-        args = new String[2];
-        args[0] = "-connect";
-        args[1] = "99.99.99.99:1448";
-
-        jcommander.parse(args);
-        delegate.applyDelegate(config);
-
-        AliasedConnection actual = config.getDefaultClientConnection();
-        assertNotNull(actual);
-        assertThat(actual.getHostname(), equalTo("99.99.99.99"));
-        assertThat(actual.getPort(), equalTo(1448));
-        assertThat(actual.getLocalConnectionEndType(), equalTo(ConnectionEndType.CLIENT));
-    }
-
     /**
      * Make sure that applying with host = null fails properly.
      */

diff --git a/TLS-Forensics/pom.xml b/TLS-Forensics/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>TLS-Forensics</artifactId>
     <packaging>jar</packaging>

diff --git a/TLS-Mitm/pom.xml b/TLS-Mitm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>TLS-Mitm</artifactId>
     <packaging>jar</packaging>

diff --git a/TLS-Server/pom.xml b/TLS-Server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>TLS-Server</artifactId>
     <packaging>jar</packaging>

diff --git a/TraceTool/pom.xml b/TraceTool/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>TraceTool</artifactId>
     <packaging>jar</packaging>

diff --git a/Transport/pom.xml b/Transport/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>Transport</artifactId>
     <packaging>jar</packaging>

diff --git a/Utils/pom.xml b/Utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsattacker</groupId>
         <artifactId>TLS-Attacker</artifactId>
-        <version>3.7.1</version>
+        <version>3.7.2</version>
     </parent>
     <artifactId>Utils</artifactId>
     <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.rub.nds.tlsattacker</groupId>
     <artifactId>TLS-Attacker</artifactId>
-    <version>3.7.1</version>
+    <version>3.7.2</version>
     <packaging>pom</packaging>
     <inceptionYear>2015</inceptionYear>
     <name>TLS-Attacker</name>
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>de.rub.nds</groupId>
             <artifactId>ModifiableVariable</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>