Merge pull request #422 from tls-attacker/fix/dheProbeNullProperty

Added missing TlsAnalyzedProperty entries

Author: mmaehren

TLS-Client-Scanner/src/main/java/de/rub/nds/tlsscanner/clientscanner/probe/DheParameterProbe.java

@@ -58,7 +58,9 @@ public DheParameterProbe(ParallelExecutor parallelExecutor, ClientScannerConfig
         super(parallelExecutor, TlsProbeType.DHE_PARAMETERS, scannerConfig);
         register(
                 TlsAnalyzedProperty.SUPPORTS_MODULUS_ONE,
+                TlsAnalyzedProperty.SUPPORTS_MODULUS_ZERO,
                 TlsAnalyzedProperty.SUPPORTS_GENERATOR_ONE,
+                TlsAnalyzedProperty.SUPPORTS_GENERATOR_ZERO,
                 TlsAnalyzedProperty.SUPPORTS_MOD3_MODULUS,
                 TlsAnalyzedProperty.SUPPORTS_EVEN_MODULUS,
                 TlsAnalyzedProperty.LOWEST_POSSIBLE_DHE_MODULUS_SIZE,
@@ -212,8 +214,12 @@ private HashMap<SmallSubgroupType, TlsAnalyzedProperty> getSmallSubgroupTypeMap(
         HashMap<SmallSubgroupType, TlsAnalyzedProperty> smallSubgroupTypeMap = new HashMap<>();
         smallSubgroupTypeMap.put(
                 SmallSubgroupType.MODULUS_ONE, TlsAnalyzedProperty.SUPPORTS_MODULUS_ONE);
+        smallSubgroupTypeMap.put(
+                SmallSubgroupType.MODULUS_ZERO, TlsAnalyzedProperty.SUPPORTS_MODULUS_ZERO);
         smallSubgroupTypeMap.put(
                 SmallSubgroupType.GENERATOR_ONE, TlsAnalyzedProperty.SUPPORTS_GENERATOR_ONE);
+        smallSubgroupTypeMap.put(
+                SmallSubgroupType.GENERATOR_ZERO, TlsAnalyzedProperty.SUPPORTS_GENERATOR_ZERO);
         return smallSubgroupTypeMap;
     }
 

TLS-Scanner-Core/src/main/java/de/rub/nds/tlsscanner/core/constants/TlsAnalyzedProperty.java

@@ -319,7 +319,9 @@ public enum TlsAnalyzedProperty implements AnalyzedProperty {
     SUPPORTS_EVEN_MODULUS(TlsAnalyzedPropertyCategory.FFDHE),
     SUPPORTS_MOD3_MODULUS(TlsAnalyzedPropertyCategory.FFDHE),
     SUPPORTS_MODULUS_ONE(TlsAnalyzedPropertyCategory.FFDHE),
+    SUPPORTS_MODULUS_ZERO(TlsAnalyzedPropertyCategory.FFDHE),
     SUPPORTS_GENERATOR_ONE(TlsAnalyzedPropertyCategory.FFDHE),
+    SUPPORTS_GENERATOR_ZERO(TlsAnalyzedPropertyCategory.FFDHE),
     WEAKEST_DH_STRENGTH(TlsAnalyzedPropertyCategory.FFDHE),
     /** DTLS */
     SUPPORTS_DTLS_FRAGMENTATION(TlsAnalyzedPropertyCategory.QUIRKS),

TLS-Server-Scanner/src/main/resources/rating/influencers.xml

@@ -2494,6 +2494,12 @@
     <ratingInfluencer>
         <property>SUPPORTS_GENERATOR_ONE</property>
     </ratingInfluencer>
+    <ratingInfluencer>
+        <property>SUPPORTS_MODULUS_ZERO</property>
+    </ratingInfluencer>
+    <ratingInfluencer>
+        <property>SUPPORTS_GENERATOR_ZERO</property>
+    </ratingInfluencer>
     <ratingInfluencer>
         <property>DTLS_FRAGMENTATION_REQUIRES_EXTENSION</property>
     </ratingInfluencer>

TLS-Server-Scanner/src/test/java/de/rub/nds/tlsscanner/serverscanner/probe/HttpFalseStartProbeIT.java

@@ -31,6 +31,6 @@ protected void prepareReport() {}
 
     @Override
     protected boolean executedAsPlanned() {
-        return verifyProperty(TlsAnalyzedProperty.SUPPORTS_HTTP_FALSE_START, TestResults.UNCERTAIN);
+        return verifyProperty(TlsAnalyzedProperty.SUPPORTS_HTTP_FALSE_START, TestResults.TRUE);
     }
 }

TLS-Server-Scanner/src/test/java/de/rub/nds/tlsscanner/serverscanner/report/rating/DefaultInfluencersIT.java

@@ -1166,6 +1166,8 @@ public void createDefaultRatingInfluencers() throws IOException, JAXBException {
                                 TlsAnalyzedProperty.SUPPORTS_MOD3_MODULUS,
                                 TlsAnalyzedProperty.SUPPORTS_MODULUS_ONE,
                                 TlsAnalyzedProperty.SUPPORTS_GENERATOR_ONE,
+                                TlsAnalyzedProperty.SUPPORTS_MODULUS_ZERO,
+                                TlsAnalyzedProperty.SUPPORTS_GENERATOR_ZERO,
                                 TlsAnalyzedProperty.DTLS_FRAGMENTATION_REQUIRES_EXTENSION,
                                 TlsAnalyzedProperty
                                         .DTLS_FRAGMENTATION_WITH_INDIVIDUAL_PACKETS_REQUIRES_EXTENSION,

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds</groupId>
         <artifactId>protocol-toolkit-bom</artifactId>
-        <version>4.1.2</version>
+        <version>4.1.6</version>
     </parent>
 
     <groupId>de.rub.nds.tls.scanner</groupId>