Skip to content

Commit 6daf029

Browse files
mmaehrenmmaehren
authored
Merge branch 'main' into fix/httpHeaderCaseInsensitivity
2 parents 52eeed0 + 1b5b37c commit 6daf029

File tree

324 files changed

+24
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+24
-369
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ public DheParameterProbe(ParallelExecutor parallelExecutor, ClientScannerConfig
5858
super(parallelExecutor, TlsProbeType.DHE_PARAMETERS, scannerConfig);
5959
register(
6060
TlsAnalyzedProperty.SUPPORTS_MODULUS_ONE,
61+
TlsAnalyzedProperty.SUPPORTS_MODULUS_ZERO,
6162
TlsAnalyzedProperty.SUPPORTS_GENERATOR_ONE,
63+
TlsAnalyzedProperty.SUPPORTS_GENERATOR_ZERO,
6264
TlsAnalyzedProperty.SUPPORTS_MOD3_MODULUS,
6365
TlsAnalyzedProperty.SUPPORTS_EVEN_MODULUS,
6466
TlsAnalyzedProperty.LOWEST_POSSIBLE_DHE_MODULUS_SIZE,
@@ -212,8 +214,12 @@ private HashMap<SmallSubgroupType, TlsAnalyzedProperty> getSmallSubgroupTypeMap(
212214
HashMap<SmallSubgroupType, TlsAnalyzedProperty> smallSubgroupTypeMap = new HashMap<>();
213215
smallSubgroupTypeMap.put(
214216
SmallSubgroupType.MODULUS_ONE, TlsAnalyzedProperty.SUPPORTS_MODULUS_ONE);
217+
smallSubgroupTypeMap.put(
218+
SmallSubgroupType.MODULUS_ZERO, TlsAnalyzedProperty.SUPPORTS_MODULUS_ZERO);
215219
smallSubgroupTypeMap.put(
216220
SmallSubgroupType.GENERATOR_ONE, TlsAnalyzedProperty.SUPPORTS_GENERATOR_ONE);
221+
smallSubgroupTypeMap.put(
222+
SmallSubgroupType.GENERATOR_ZERO, TlsAnalyzedProperty.SUPPORTS_GENERATOR_ZERO);
217223
return smallSubgroupTypeMap;
218224
}
219225

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,9 @@ public enum TlsAnalyzedProperty implements AnalyzedProperty {
319319
SUPPORTS_EVEN_MODULUS(TlsAnalyzedPropertyCategory.FFDHE),
320320
SUPPORTS_MOD3_MODULUS(TlsAnalyzedPropertyCategory.FFDHE),
321321
SUPPORTS_MODULUS_ONE(TlsAnalyzedPropertyCategory.FFDHE),
322+
SUPPORTS_MODULUS_ZERO(TlsAnalyzedPropertyCategory.FFDHE),
322323
SUPPORTS_GENERATOR_ONE(TlsAnalyzedPropertyCategory.FFDHE),
324+
SUPPORTS_GENERATOR_ZERO(TlsAnalyzedPropertyCategory.FFDHE),
323325
WEAKEST_DH_STRENGTH(TlsAnalyzedPropertyCategory.FFDHE),
324326
/** DTLS */
325327
SUPPORTS_DTLS_FRAGMENTATION(TlsAnalyzedPropertyCategory.QUIRKS),

‎TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/EsniProbe.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import de.rub.nds.tlsattacker.core.state.State;
2121
import de.rub.nds.tlsattacker.core.workflow.ParallelExecutor;
2222
import de.rub.nds.tlsattacker.core.workflow.WorkflowTraceResultUtil;
23+
import de.rub.nds.tlsattacker.core.workflow.action.EsniKeyDnsRequestAction;
24+
import de.rub.nds.tlsattacker.core.workflow.action.TlsAction;
2325
import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
2426
import de.rub.nds.tlsscanner.core.constants.ProtocolType;
2527
import de.rub.nds.tlsscanner.core.constants.TlsAnalyzedProperty;
@@ -49,6 +51,8 @@ protected void executeTest() {
4951
tlsConfig.setDefaultClientKeyShareNamedGroups(NamedGroup.ECDH_X25519);
5052
State state = new State(tlsConfig);
5153
executeState(state);
54+
TlsAction firstFailedAction =
55+
WorkflowTraceResultUtil.getFirstFailedAction(state.getWorkflowTrace());
5256

5357
TlsContext context = state.getTlsContext();
5458
boolean isDnsKeyRecordAvailable = context.getEsniRecordBytes() != null;
@@ -57,7 +61,8 @@ protected void executeTest() {
5761
&& Arrays.equals(
5862
context.getEsniServerNonce(), context.getEsniClientNonce());
5963
if (!WorkflowTraceResultUtil.didReceiveMessage(
60-
state.getWorkflowTrace(), HandshakeMessageType.SERVER_HELLO)) {
64+
state.getWorkflowTrace(), HandshakeMessageType.SERVER_HELLO)
65+
&& !EsniKeyDnsRequestAction.class.equals(firstFailedAction.getClass())) {
6166
receivedCorrectNonce = TestResults.ERROR_DURING_TEST;
6267
} else if (isDnsKeyRecordAvailable && isReceivedCorrectNonce) {
6368
receivedCorrectNonce = TestResults.TRUE;

‎TLS-Server-Scanner/src/main/resources/configs/default.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@
357357
<defaultClientSupportedCipherSuite>TLS_PSK_WITH_AES_256_CCM_8</defaultClientSupportedCipherSuite>
358358
<defaultClientSupportedCipherSuite>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultClientSupportedCipherSuite>
359359
<defaultClientSupportedCipherSuite>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultClientSupportedCipherSuite>
360-
<defaultClientSupportedCipherSuite>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultClientSupportedCipherSuite>
361360
<defaultClientSupportedCipherSuite>TLS_ECDHE_ECDSA_WITH_AES_128_CCM</defaultClientSupportedCipherSuite>
362361
<defaultClientSupportedCipherSuite>TLS_ECDHE_ECDSA_WITH_AES_256_CCM</defaultClientSupportedCipherSuite>
363362
<defaultClientSupportedCipherSuite>TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8</defaultClientSupportedCipherSuite>

‎TLS-Server-Scanner/src/main/resources/extracted_client_configs/client_BEARSSL_0.4.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@
236236
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA</defaultServerSupportedCipherSuites>
237237
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultServerSupportedCipherSuites>
238238
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultServerSupportedCipherSuites>
239-
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultServerSupportedCipherSuites>
240239
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_3DES_EDE_CBC_SHA</defaultServerSupportedCipherSuites>
241240
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA256</defaultServerSupportedCipherSuites>
242241
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CCM</defaultServerSupportedCipherSuites>

‎TLS-Server-Scanner/src/main/resources/extracted_client_configs/client_BORINGSSL_2272.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@
232232
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA</defaultServerSupportedCipherSuites>
233233
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultServerSupportedCipherSuites>
234234
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultServerSupportedCipherSuites>
235-
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultServerSupportedCipherSuites>
236235
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_3DES_EDE_CBC_SHA</defaultServerSupportedCipherSuites>
237236
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA256</defaultServerSupportedCipherSuites>
238237
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CCM</defaultServerSupportedCipherSuites>

‎TLS-Server-Scanner/src/main/resources/extracted_client_configs/client_BORINGSSL_2311.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@
232232
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA</defaultServerSupportedCipherSuites>
233233
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultServerSupportedCipherSuites>
234234
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultServerSupportedCipherSuites>
235-
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultServerSupportedCipherSuites>
236235
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_3DES_EDE_CBC_SHA</defaultServerSupportedCipherSuites>
237236
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA256</defaultServerSupportedCipherSuites>
238237
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CCM</defaultServerSupportedCipherSuites>

‎TLS-Server-Scanner/src/main/resources/extracted_client_configs/client_BORINGSSL_2357.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@
232232
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA</defaultServerSupportedCipherSuites>
233233
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultServerSupportedCipherSuites>
234234
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultServerSupportedCipherSuites>
235-
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultServerSupportedCipherSuites>
236235
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_3DES_EDE_CBC_SHA</defaultServerSupportedCipherSuites>
237236
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA256</defaultServerSupportedCipherSuites>
238237
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CCM</defaultServerSupportedCipherSuites>

‎TLS-Server-Scanner/src/main/resources/extracted_client_configs/client_BORINGSSL_2490.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@
231231
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA</defaultServerSupportedCipherSuites>
232232
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultServerSupportedCipherSuites>
233233
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultServerSupportedCipherSuites>
234-
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultServerSupportedCipherSuites>
235234
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_3DES_EDE_CBC_SHA</defaultServerSupportedCipherSuites>
236235
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA256</defaultServerSupportedCipherSuites>
237236
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CCM</defaultServerSupportedCipherSuites>

‎TLS-Server-Scanner/src/main/resources/extracted_client_configs/client_BORINGSSL_2564.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@
230230
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA</defaultServerSupportedCipherSuites>
231231
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_128_CCM_8</defaultServerSupportedCipherSuites>
232232
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_8</defaultServerSupportedCipherSuites>
233-
<defaultServerSupportedCipherSuites>TLS_PSK_DHE_WITH_AES_256_CCM_80</defaultServerSupportedCipherSuites>
234233
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_3DES_EDE_CBC_SHA</defaultServerSupportedCipherSuites>
235234
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CBC_SHA256</defaultServerSupportedCipherSuites>
236235
<defaultServerSupportedCipherSuites>TLS_PSK_WITH_AES_128_CCM</defaultServerSupportedCipherSuites>

0 commit comments

Comments
 (0)