rename property

Author: stoty

zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md

@@ -1776,8 +1776,8 @@ and [SASL authentication for ZooKeeper](https://cwiki.apache.org/confluence/disp
     Specifies whether Online Certificate Status Protocol is enabled in client and quorum TLS protocols.
     Default: false
 
-* *ssl.tcnative.ocsp* and *ssl.quorum.tcnative.ocsp* :
-    (Java system properties: **zookeeper.ssl.tcnative.ocsp** and **zookeeper.ssl.quorum.tcnative.ocsp**)
+* *ssl.tcnative.ocsp.stapling* and *ssl.quorum.tcnative.ocsp.stapling* :
+    (Java system properties: **zookeeper.ssl.tcnative.ocsp.stapling** and **zookeeper.ssl.quorum.tcnative.ocsp.stapling**)
     **New in 3.10.0:**
     Specifies whether OCSP stapling is requested by the client.
     This option has no effect unless the the OpenSSL tcnative SSL provider with the OpenSSL library is used.

zookeeper-server/src/main/java/org/apache/zookeeper/common/ClientX509Util.java

@@ -89,10 +89,10 @@ public SslContext createNettySslContextForClient(ZKConfig config)
             sslContextBuilder.enableOcsp(ocspEnabled);
         }
         // Explicit option takes precedence if set
-        if (config.getTristate(getSslTcnativeOcspEnabledProperty()).isTrue()) {
+        if (config.getTristate(getSslTcnativeOcspStaplingEnabledProperty()).isTrue()) {
             logTcnativeOcsp(true);
             sslContextBuilder.enableOcsp(true);
-        } else if (config.getTristate(getSslTcnativeOcspEnabledProperty()).isFalse()) {
+        } else if (config.getTristate(getSslTcnativeOcspStaplingEnabledProperty()).isFalse()) {
             sslContextBuilder.enableOcsp(false);
         }
         String[] enabledProtocols = getEnabledProtocols(config);
@@ -117,7 +117,7 @@ private void logTcnativeOcsp(boolean enable) {
         if (enable && !OpenSsl.isOcspSupported()) {
             // SslContextBuilder.enableOcsp() doesn't do anything, unless the default BoringSSL
             // tcnative dependency is replaced with an OpenSsl one.
-            LOG.warn("Trying to enable OCSP for tcnative OpenSSL provider, but it is not supported. The setting will be ignored");
+            LOG.warn("Trying to enable OCSP for tcnative OpenSSL provider, but it is not supported. The setting will be ignored", OpenSsl.versionString());
         }
     }
 
@@ -150,9 +150,9 @@ public SslContext createNettySslContextForServer(ZKConfig config, KeyManager key
         if (sslProvider == SslProvider.OPENSSL || sslProvider == SslProvider.OPENSSL_REFCNT) {
             sslContextBuilder.enableOcsp(config.getBoolean(getSslOcspEnabledProperty()));
         }
-        if (config.getTristate(getSslTcnativeOcspEnabledProperty()).isTrue()) {
+        if (config.getTristate(getSslTcnativeOcspStaplingEnabledProperty()).isTrue()) {
             sslContextBuilder.enableOcsp(true);
-        } else if (config.getTristate(getSslTcnativeOcspEnabledProperty()).isFalse()) {
+        } else if (config.getTristate(getSslTcnativeOcspStaplingEnabledProperty()).isFalse()) {
             sslContextBuilder.enableOcsp(false);
         }
         String[] enabledProtocols = getEnabledProtocols(config);

zookeeper-server/src/main/java/org/apache/zookeeper/common/X509Util.java

@@ -164,7 +164,7 @@ public io.netty.handler.ssl.ClientAuth toNettyClientAuth() {
     private final String sslClientHostnameVerificationEnabledProperty = getConfigPrefix() + "clientHostnameVerification";
     private final String sslCrlEnabledProperty = getConfigPrefix() + "crl";
     private final String sslOcspEnabledProperty = getConfigPrefix() + "ocsp";
-    private final String sslTcnativeOcspEnabledProperty = getConfigPrefix() + ".tcnative.ocsp";
+    private final String sslTcnativeOcspStaplingEnabledProperty = getConfigPrefix() + ".tcnative.ocsp.stapling";
     private final String sslClientAuthProperty = getConfigPrefix() + "clientAuth";
     private final String sslHandshakeDetectionTimeoutMillisProperty = getConfigPrefix() + "handshakeDetectionTimeoutMillis";
 
@@ -249,8 +249,8 @@ public String getSslOcspEnabledProperty() {
         return sslOcspEnabledProperty;
     }
 
-    public String getSslTcnativeOcspEnabledProperty() {
-        return sslTcnativeOcspEnabledProperty;
+    public String getSslTcnativeOcspStaplingEnabledProperty() {
+        return sslTcnativeOcspStaplingEnabledProperty;
     }
 
     public String getSslClientAuthProperty() {

zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKConfig.java

@@ -131,7 +131,7 @@ private void putSSLProperties(X509Util x509Util) {
         properties.put(x509Util.getSslHostnameVerificationEnabledProperty(), System.getProperty(x509Util.getSslHostnameVerificationEnabledProperty()));
         properties.put(x509Util.getSslCrlEnabledProperty(), System.getProperty(x509Util.getSslCrlEnabledProperty()));
         properties.put(x509Util.getSslOcspEnabledProperty(), System.getProperty(x509Util.getSslOcspEnabledProperty()));
-        properties.put(x509Util.getSslTcnativeOcspEnabledProperty(), System.getProperty(x509Util.getSslTcnativeOcspEnabledProperty()));
+        properties.put(x509Util.getSslTcnativeOcspStaplingEnabledProperty(), System.getProperty(x509Util.getSslTcnativeOcspStaplingEnabledProperty()));
         properties.put(x509Util.getSslClientAuthProperty(), System.getProperty(x509Util.getSslClientAuthProperty()));
         properties.put(x509Util.getSslHandshakeDetectionTimeoutMillisProperty(), System.getProperty(x509Util.getSslHandshakeDetectionTimeoutMillisProperty()));
         properties.put(x509Util.getFipsModeProperty(), System.getProperty(x509Util.getFipsModeProperty()));