Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 f3f1146a7 -> c6bd49c4c


ZOOKEEPER-3194: Quorum TLS - fix copy/paste bug in ZKTrustManager

Fix an obvious copy/paste bug. Tested by making sure ZKTrustManagerTest still 
passes.

Author: Ilya Maykov <[email protected]>

Reviewers: [email protected]

Closes #709 from ivmaykov/ZOOKEEPER-3194

(cherry picked from commit a109b8b5034a160c3ad0f4d2b790df962ff4dc47)
Signed-off-by: Andor Molnar <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/c6bd49c4
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/c6bd49c4
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/c6bd49c4

Branch: refs/heads/branch-3.5
Commit: c6bd49c4ce217cfbfc8162158c471a9254a366f2
Parents: f3f1146
Author: Ilya Maykov <[email protected]>
Authored: Tue Nov 27 21:04:31 2018 +0100
Committer: Andor Molnar <[email protected]>
Committed: Tue Nov 27 21:05:46 2018 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/zookeeper/common/ZKTrustManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/c6bd49c4/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
----------------------------------------------------------------------
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
index 73006d0..aa02145 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKTrustManager.java
@@ -85,7 +85,7 @@ public class ZKTrustManager extends X509ExtendedTrustManager {
 
     @Override
     public void checkClientTrusted(X509Certificate[] chain, String authType, 
SSLEngine engine) throws CertificateException {
-        x509ExtendedTrustManager.checkServerTrusted(chain, authType, engine);
+        x509ExtendedTrustManager.checkClientTrusted(chain, authType, engine);
         if (clientHostnameVerificationEnabled) {
             try {
                 
performHostVerification(InetAddress.getByName(engine.getPeerHost()), chain[0]);

Reply via email to