Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9BCC5200C68 for ; Wed, 3 May 2017 10:22:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9A95D160BBC; Wed, 3 May 2017 08:22:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E9EC6160BAA for ; Wed, 3 May 2017 10:22:41 +0200 (CEST) Received: (qmail 35046 invoked by uid 500); 3 May 2017 08:22:41 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 35031 invoked by uid 99); 3 May 2017 08:22:41 -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; Wed, 03 May 2017 08:22:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D824CE04AA; Wed, 3 May 2017 08:22:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Wed, 03 May 2017 08:22:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] directory-kerby git commit: Merge remote-tracking branch 'asf/trunk' into trunk archived-at: Wed, 03 May 2017 08:22:42 -0000 Merge remote-tracking branch 'asf/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/405898e0 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/405898e0 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/405898e0 Branch: refs/heads/trunk Commit: 405898e04e7767495af48138d3c8cae85490f109 Parents: 3e6f9d0 b7da10e Author: plusplusjiajia Authored: Wed May 3 13:57:07 2017 +0800 Committer: plusplusjiajia Committed: Wed May 3 13:57:07 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kerby/asn1/TaggingOption.java | 2 +- .../java/org/apache/kerby/asn1/util/IOUtil.java | 30 +++++++++++--------- .../java/org/apache/kerby/config/Resource.java | 7 ++--- .../main/java/org/apache/kerby/util/IOUtil.java | 30 +++++++++++--------- .../main/java/org/apache/kerby/util/Util.java | 4 +-- .../java/org/apache/kerby/xdr/util/IOUtil.java | 30 +++++++++++--------- .../test/jaas/TokenAuthLoginModule.java | 10 +++---- .../kerb/integration/test/jaas/TokenCache.java | 4 +-- .../kerby/kerberos/kerb/common/Krb5Parser.java | 6 ++-- .../kerb/preauth/pkinit/CertificateHelper.java | 8 +++--- .../kerb/crypto/random/NativeRandom.java | 11 ++++--- .../kerb/server/preauth/token/TokenPreauth.java | 8 +++--- kerby-kerb/kerb-util/pom.xml | 9 ++---- .../kerberos/kerb/ccache/CredentialCache.java | 7 ++--- .../kerby/kerberos/kerb/keytab/Keytab.java | 7 ++--- .../kerberos/kerb/keytab/KeytabEntryTest.java | 2 +- kerby-pkix/pom.xml | 4 +-- .../kerby/kerberos/tool/klist/KlistTool.java | 5 ++-- .../kerby/kerberos/tool/token/TokenCache.java | 7 ++--- pom.xml | 17 +++++------ 20 files changed, 103 insertions(+), 105 deletions(-) ----------------------------------------------------------------------