From 9d89b47c68a6b476135c04b633e7d080a8ebe65f Mon Sep 17 00:00:00 2001 From: Rishabh Saraswat Date: Fri, 28 Nov 2025 01:20:40 +0530 Subject: [PATCH] Update cassandra-stress default cipher suites to support tls 1.3 patch by Rishabh Saraswat; reviewed by Jyothsna Konisa, Brad Schoening for CASSANDRA-21007 --- .../cassandra/stress/settings/SettingsTransport.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java index ccdf0a53b2..65039bdf80 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java @@ -54,8 +54,10 @@ public class SettingsTransport implements Serializable .withTrustStore(options.trustStore.value()) .withTrustStorePassword(options.trustStorePw.setByUser() ? options.trustStorePw.value() : credentials.transportTruststorePassword) .withAlgorithm(options.alg.value()) - .withProtocol(options.protocol.value()) - .withCipherSuites(options.ciphers.value().split(",")); + .withProtocol(options.protocol.value()); + + if (options.ciphers.value() != null) + encOptionsBuilder.withCipherSuites(options.ciphers.value().split(",")); if (options.keyStore.present()) { @@ -88,8 +90,9 @@ public class SettingsTransport implements Serializable TRANSPORT_KEYSTORE_PASSWORD_PROPERTY_KEY), false); final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", false); final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", null, "SSL: algorithm", false); + // Null is to auto-negotiate final OptionSimple ciphers = new OptionSimple("ssl-ciphers=", ".*", - "TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA", + null, "SSL: comma delimited list of encryption suites to use", false); @Override