natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update cassandra-stress to support TLS 1.3 by default by auto-negotiation 

This is a backport of 9d89b47c68 to cassandra-5.0 branch.

patch by Rishabh Saraswat; reviewed by Jyothsna Konisa, Brad Schoening for CASSANDRA-21007
This commit is contained in:
jkonisa 2025-12-15 13:58:37 -08:00 committed by Stefan Miklosovic
parent 32d541557c
commit 03dc5a061c
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
5.0.8
* Update cassandra-stress to support TLS 1.3 by default by auto-negotiation (CASSANDRA-21007)
* Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21173)
Merged from 4.1:
Merged from 4.0:

9
tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
View File

@ -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)
encOptions = encOptions.withCipherSuites(options.ciphers.value().split(","));
if (options.keyStore.present())
{
encOptions = encOptions
@ -87,8 +89,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