Skip to content

Commit c80a03d

Browse files
Add warn log statement if PQ disabled but non-PQ default not supported
1 parent 3d5d111 commit c80a03d

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtConfigurationUtils.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
import software.amazon.awssdk.http.SdkHttpConfigurationOption;
2525
import software.amazon.awssdk.http.crt.TcpKeepAliveConfiguration;
2626
import software.amazon.awssdk.utils.AttributeMap;
27+
import software.amazon.awssdk.utils.Logger;
2728
import software.amazon.awssdk.utils.NumericUtils;
2829

2930
@SdkInternalApi
3031
public final class AwsCrtConfigurationUtils {
32+
private static final Logger log = Logger.loggerFor(AwsCrtConfigurationUtils.class);
3133

3234
private AwsCrtConfigurationUtils() {
3335
}
@@ -57,9 +59,12 @@ public static SocketOptions buildSocketOptions(TcpKeepAliveConfiguration tcpKeep
5759
public static TlsCipherPreference resolveCipherPreference(Boolean postQuantumTlsEnabled) {
5860
// As of v0.39.3, aws-crt-java prefers PQ by default, so only return the non-PQ-default policy
5961
// below if the caller explicitly disables PQ by passing in false.
60-
if (Boolean.FALSE.equals(postQuantumTlsEnabled)
61-
&& TlsCipherPreference.TLS_CIPHER_NON_PQ_DEFAULT.isSupported()) {
62-
return TlsCipherPreference.TLS_CIPHER_NON_PQ_DEFAULT;
62+
if (Boolean.FALSE.equals(postQuantumTlsEnabled)) {
63+
if (TlsCipherPreference.TLS_CIPHER_NON_PQ_DEFAULT.isSupported()) {
64+
return TlsCipherPreference.TLS_CIPHER_NON_PQ_DEFAULT;
65+
}
66+
log.warn(() -> "Post-quantum TLS was explicitly disabled but TLS_CIPHER_NON_PQ_DEFAULT is not supported. "
67+
+ "Falling back to TLS_CIPHER_SYSTEM_DEFAULT.");
6368
}
6469
return TlsCipherPreference.TLS_CIPHER_SYSTEM_DEFAULT;
6570
}

0 commit comments

Comments
 (0)