mirror of https://github.com/apache/cassandra
Update cassandra-stress default cipher suites to support tls 1.3
patch by Rishabh Saraswat; reviewed by Jyothsna Konisa, Brad Schoening for CASSANDRA-21007
This commit is contained in:
parent
e4684a11ec
commit
9d89b47c68
|
|
@ -54,8 +54,10 @@ public class SettingsTransport implements Serializable
|
||||||
.withTrustStore(options.trustStore.value())
|
.withTrustStore(options.trustStore.value())
|
||||||
.withTrustStorePassword(options.trustStorePw.setByUser() ? options.trustStorePw.value() : credentials.transportTruststorePassword)
|
.withTrustStorePassword(options.trustStorePw.setByUser() ? options.trustStorePw.value() : credentials.transportTruststorePassword)
|
||||||
.withAlgorithm(options.alg.value())
|
.withAlgorithm(options.alg.value())
|
||||||
.withProtocol(options.protocol.value())
|
.withProtocol(options.protocol.value());
|
||||||
.withCipherSuites(options.ciphers.value().split(","));
|
|
||||||
|
if (options.ciphers.value() != null)
|
||||||
|
encOptionsBuilder.withCipherSuites(options.ciphers.value().split(","));
|
||||||
|
|
||||||
if (options.keyStore.present())
|
if (options.keyStore.present())
|
||||||
{
|
{
|
||||||
|
|
@ -88,8 +90,9 @@ public class SettingsTransport implements Serializable
|
||||||
TRANSPORT_KEYSTORE_PASSWORD_PROPERTY_KEY), false);
|
TRANSPORT_KEYSTORE_PASSWORD_PROPERTY_KEY), false);
|
||||||
final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", 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);
|
final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", null, "SSL: algorithm", false);
|
||||||
|
// Null is to auto-negotiate
|
||||||
final OptionSimple ciphers = new OptionSimple("ssl-ciphers=", ".*",
|
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);
|
"SSL: comma delimited list of encryption suites to use", false);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue