This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new 0806d80 ZOOKEEPER-3960: Update Programmers Guide about key file
format parameters
0806d80 is described below
commit 0806d80dbf94be13c783c11df470be4695786b4e
Author: Mate Szalay-Beko <[email protected]>
AuthorDate: Fri Oct 9 13:07:15 2020 +0000
ZOOKEEPER-3960: Update Programmers Guide about key file format parameters
The Programmer's guide doesn't contain the parameters needed to be changed
in order to specify keystore and truststore file formats for the Java Clients.
see:
https://zookeeper.apache.org/doc/r3.6.2/zookeeperProgrammers.html#sc_java_client_configuration
Author: Mate Szalay-Beko <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Norbert Kalmar
<[email protected]>
Closes #1488 from symat/zookeeper-3960
(cherry picked from commit c4169b6f64b8a8668f2037adcf71148752d3066d)
Signed-off-by: Mate Szalay-Beko <[email protected]>
---
.../src/main/resources/markdown/zookeeperProgrammers.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperProgrammers.md
b/zookeeper-docs/src/main/resources/markdown/zookeeperProgrammers.md
index 68662f3..7c0d4ec 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperProgrammers.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperProgrammers.md
@@ -1320,6 +1320,7 @@ and [SASL authentication for
ZooKeeper](https://cwiki.apache.org/confluence/disp
this behavior by setting zookeeper.disableAutoWatchReset to **true**.
* *zookeeper.client.secure* :
+ **New in 3.5.5:**
If you want to connect to the server secure client port, you need to set
this property to
**true**
on the client. This will connect to server using SSL with specified
credentials. Note that
@@ -1337,13 +1338,22 @@ and [SASL authentication for
ZooKeeper](https://cwiki.apache.org/confluence/disp
on client.
* *zookeeper.ssl.keyStore.location and zookeeper.ssl.keyStore.password* :
+ **New in 3.5.5:**
Specifies the file path to a JKS containing the local credentials to be
used for SSL connections,
and the password to unlock the file.
* *zookeeper.ssl.trustStore.location and zookeeper.ssl.trustStore.password* :
+ **New in 3.5.5:**
Specifies the file path to a JKS containing the remote credentials to be
used for SSL connections,
and the password to unlock the file.
+* *zookeeper.ssl.keyStore.type* and *zookeeper.ssl.trustStore.type*:
+ **New in 3.5.5:**
+ Specifies the file format of keys/trust store files used to establish TLS
connection to the ZooKeeper server.
+ Values: JKS, PEM, PKCS12 or null (detect by filename). Default: null.
+ **New in 3.6.3, 3.7.0:**
+ The format BCFKS was added.
+
* *jute.maxbuffer* :
In the client side, it specifies the maximum size of the incoming data
from the server. The default is 0xfffff(1048575) bytes,
or just under 1M. This is really a sanity check. The ZooKeeper server is
designed to store and send
