diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-11-14 15:05:01 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2019-11-14 15:05:01 +0100 |
| commit | 8d2020ba3cca485e8ef477d66df3f5098c8de3fd (patch) | |
| tree | 2051a026a8a8bc9a7c4db57493c732491d4de3bb /zookeeper-server | |
| parent | e7df005495cdc3cf17623339b2c33ca832b6aeb7 (diff) | |
Set correct value for protocol
Diffstat (limited to 'zookeeper-server')
2 files changed, 2 insertions, 2 deletions
diff --git a/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java index 459df59fa1b..4b4923cfcc7 100644 --- a/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java +++ b/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java @@ -91,7 +91,7 @@ public class VespaZooKeeperServerImpl extends AbstractComponent implements Runna sb.append("ssl.quorum.clientAuth=NEED\n"); sb.append("ssl.quorum.ciphersuites=").append(String.join(",", new TreeSet<>(TlsContext.ALLOWED_CIPHER_SUITES))).append("\n"); sb.append("ssl.quorum.enabledProtocols=").append(String.join(",", new TreeSet<>(TlsContext.ALLOWED_PROTOCOLS))).append("\n"); - sb.append("ssl.quorum.protocol=TLSv1.2\n"); + sb.append("ssl.quorum.protocol=TLS\n"); String tlsSetting = config.tlsForQuorumCommunication().name(); switch (tlsSetting) { diff --git a/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java b/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java index eea5189fc5a..fcca602a2ed 100644 --- a/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java +++ b/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java @@ -164,7 +164,7 @@ public class VespaZooKeeperServerImplTest { "ssl.quorum.clientAuth=NEED\n" + "ssl.quorum.ciphersuites=TLS_AES_128_GCM_SHA256,TLS_AES_256_GCM_SHA384,TLS_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256\n" + "ssl.quorum.enabledProtocols=TLSv1.2\n" + - "ssl.quorum.protocol=TLSv1.2\n"; + "ssl.quorum.protocol=TLS\n"; } private void validateConfigFileMultipleHosts(File cfgFile) throws IOException { |