Fixes for IC probe in public release (#243)

* Don't attempt to test with FFDHE
tls-attacker · Jun 14, 2022 · a348f97 · a348f97
1 parent 3262c4e
commit a348f97
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/Scanner-Core/pom.xml b/Scanner-Core/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>de.rub.nds.tlsscanner</groupId>
         <artifactId>TLS-Scanner</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>4.2.2</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>Scanner-Core</artifactId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.2.2</version>
     <build>
         <plugins>
             <plugin>

diff --git a/TLS-Client-Scanner/pom.xml b/TLS-Client-Scanner/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsscanner</groupId>
         <artifactId>TLS-Scanner</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>4.2.2</version>
     </parent>
     <name>TLS-Client-Scanner</name>
     <packaging>jar</packaging>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>de.rub.nds.tlsscanner</groupId>
             <artifactId>Scanner-Core</artifactId>
-            <version>4.3.0-SNAPSHOT</version>
+            <version>4.2.2</version>
             <type>jar</type>
         </dependency>
     </dependencies>

diff --git a/TLS-Scanner-Core/pom.xml b/TLS-Scanner-Core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsscanner</groupId>
         <artifactId>TLS-Scanner</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>4.2.2</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>TLS-Scanner-Core</artifactId>

diff --git a/TLS-Server-Scanner/pom.xml b/TLS-Server-Scanner/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds.tlsscanner</groupId>
         <artifactId>TLS-Scanner</artifactId>
-        <version>4.3.0-SNAPSHOT</version>
+        <version>4.2.2</version>
     </parent>
     <name>TLS-Server-Scanner</name>
     <packaging>jar</packaging>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>de.rub.nds.tlsscanner</groupId>
             <artifactId>Scanner-Core</artifactId>
-            <version>4.3.0-SNAPSHOT</version>
+            <version>4.2.2</version>
             <type>jar</type>
         </dependency>
     </dependencies>

diff --git a/...er-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java b/...er-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java
@@ -141,7 +141,7 @@ public void adjustConfig(ServerReport report) {
         supportedFpGroups = new LinkedList<>();
         if (report.getSupportedNamedGroups() != null) {
             for (NamedGroup group : report.getSupportedNamedGroups()) {
-                if (NamedGroup.getImplemented().contains(group)
+                if (NamedGroup.getImplemented().contains(group) && group.isCurve()
                     && CurveFactory.getCurve(group) instanceof EllipticCurveOverFp) {
                     supportedFpGroups.add(group);
                 }

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>TLS-Scanner</artifactId>
     <groupId>de.rub.nds.tlsscanner</groupId>
-    <version>4.3.0-SNAPSHOT</version>
+    <version>4.2.2</version>
     <packaging>pom</packaging>
     <name>TLS-Scanner</name>
     <url>https://github.com/tls-attacker/TLS-Scanner</url>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>de.rub.nds.tlsattacker</groupId>
             <artifactId>TLS-Core</artifactId>
-            <version>3.9.0-SNAPSHOT</version>
+            <version>3.8.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>