From dev-return-75394-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org  Fri Nov  2 16:42:04 2018
Return-Path: <dev-return-75394-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id C836A18062B
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  2 Nov 2018 16:42:03 +0100 (CET)
Received: (qmail 74126 invoked by uid 500); 2 Nov 2018 15:42:02 -0000
Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:dev@zookeeper.apache.org>
List-Id: <dev.zookeeper.apache.org>
Reply-To: dev@zookeeper.apache.org
Delivered-To: mailing list dev@zookeeper.apache.org
Received: (qmail 74104 invoked by uid 99); 2 Nov 2018 15:42:02 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2018 15:42:02 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 126B9DFD77; Fri,  2 Nov 2018 15:42:02 +0000 (UTC)
From: ivmaykov <git@git.apache.org>
To: dev@zookeeper.apache.org
Reply-To: dev@zookeeper.apache.org
References: <git-pr-678-zookeeper@git.apache.org>
In-Reply-To: <git-pr-678-zookeeper@git.apache.org>
Subject: [GitHub] zookeeper pull request #678: ZOOKEEPER-3173: Quorum TLS - support PEM trust/...
Content-Type: text/plain
Message-Id: <20181102154202.126B9DFD77@git1-us-west.apache.org>
Date: Fri,  2 Nov 2018 15:42:02 +0000 (UTC)

Github user ivmaykov commented on a diff in the pull request:

    https://github.com/apache/zookeeper/pull/678#discussion_r230418985
  
    --- Diff: zookeeper-server/src/main/java/org/apache/zookeeper/common/JKSFileLoader.java ---
    @@ -0,0 +1,67 @@
    +/**
    + * Licensed to the Apache Software Foundation (ASF) under one
    + * or more contributor license agreements.  See the NOTICE file
    + * distributed with this work for additional information
    + * regarding copyright ownership.  The ASF licenses this file
    + * to you under the Apache License, Version 2.0 (the
    + * "License"); you may not use this file except in compliance
    + * with the License.  You may obtain a copy of the License at
    + *
    + *     http://www.apache.org/licenses/LICENSE-2.0
    + *
    + * Unless required by applicable law or agreed to in writing, software
    + * distributed under the License is distributed on an "AS IS" BASIS,
    + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    + * See the License for the specific language governing permissions and
    + * limitations under the License.
    + */
    +
    +package org.apache.zookeeper.common;
    +
    +import java.io.File;
    +import java.io.FileInputStream;
    +import java.io.IOException;
    +import java.io.InputStream;
    +import java.security.GeneralSecurityException;
    +import java.security.KeyStore;
    +
    +/**
    + * Implementation of {@link FileKeyStoreLoader} that loads from JKS files.
    + */
    +class JKSFileLoader extends FileKeyStoreLoader {
    +    private static final char[] EMPTY_CHAR_ARRAY = new char[0];
    +
    +    private JKSFileLoader(String keyStorePath,
    +                          String trustStorePath,
    +                          String keyStorePassword,
    +                          String trustStorePassword) {
    +        super(keyStorePath, trustStorePath, keyStorePassword, trustStorePassword);
    +    }
    +
    +    @Override
    +    public KeyStore loadKeyStore() throws IOException, GeneralSecurityException {
    +        KeyStore ks = KeyStore.getInstance("JKS");
    --- End diff --
    
    Will do


---