Merge pull request #221 from tls-attacker/icProbeFix

mmaehren · web-flow · commit 2f708459ba84 · 2022-04-26T14:04:15.000+02:00
Fixed InvalidCurve probe for host that support FFDHE groups
diff --git a/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java b/TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/InvalidCurveProbe.java
@@ -209,7 +209,7 @@ public void adjustConfig(ServerReport report) {
         if (report.getResult(TlsAnalyzedProperty.SUPPORTS_TLS_1_3) == TestResult.TRUE) {
             protocolVersions.add(ProtocolVersion.TLS13);
             for (NamedGroup group : report.getSupportedTls13Groups()) {
-                if (NamedGroup.getImplemented().contains(group)
+                if (NamedGroup.getImplemented().contains(group) && group.isCurve()
                     && CurveFactory.getCurve(group) instanceof EllipticCurveOverFp) {
                     supportedTls13FpGroups.add(group);
                 }

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public void adjustConfig(ServerReport report) {`
`209`	`209`	`if (report.getResult(TlsAnalyzedProperty.SUPPORTS_TLS_1_3) == TestResult.TRUE) {`
`210`	`210`	`protocolVersions.add(ProtocolVersion.TLS13);`
`211`	`211`	`for (NamedGroup group : report.getSupportedTls13Groups()) {`
`212`		`- if (NamedGroup.getImplemented().contains(group)`
	`212`	`+ if (NamedGroup.getImplemented().contains(group) && group.isCurve()`
`213`	`213`	`&& CurveFactory.getCurve(group) instanceof EllipticCurveOverFp) {`
`214`	`214`	`supportedTls13FpGroups.add(group);`
`215`	`215`	`}`