Skip to content

Commit 9d89b47

Browse files
omniCoder77jyothsnakonisa
authored andcommitted
Update cassandra-stress default cipher suites to support tls 1.3
patch by Rishabh Saraswat; reviewed by Jyothsna Konisa, Brad Schoening for CASSANDRA-21007
1 parent e4684a1 commit 9d89b47

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ public EncryptionOptions.ClientEncryptionOptions getEncryptionOptions()
5454
.withTrustStore(options.trustStore.value())
5555
.withTrustStorePassword(options.trustStorePw.setByUser() ? options.trustStorePw.value() : credentials.transportTruststorePassword)
5656
.withAlgorithm(options.alg.value())
57-
.withProtocol(options.protocol.value())
58-
.withCipherSuites(options.ciphers.value().split(","));
57+
.withProtocol(options.protocol.value());
58+
59+
if (options.ciphers.value() != null)
60+
encOptionsBuilder.withCipherSuites(options.ciphers.value().split(","));
5961

6062
if (options.keyStore.present())
6163
{
@@ -88,8 +90,9 @@ static class TOptions extends GroupedOptions implements Serializable
8890
TRANSPORT_KEYSTORE_PASSWORD_PROPERTY_KEY), false);
8991
final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", false);
9092
final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", null, "SSL: algorithm", false);
93+
// Null is to auto-negotiate
9194
final OptionSimple ciphers = new OptionSimple("ssl-ciphers=", ".*",
92-
"TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA",
95+
null,
9396
"SSL: comma delimited list of encryption suites to use", false);
9497

9598
@Override

0 commit comments

Comments
 (0)