Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D41318722 for ; Thu, 10 Dec 2015 08:10:01 +0000 (UTC) Received: (qmail 55839 invoked by uid 500); 10 Dec 2015 08:10:01 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 55711 invoked by uid 500); 10 Dec 2015 08:10:01 -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 55528 invoked by uid 99); 10 Dec 2015 08:10:01 -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; Thu, 10 Dec 2015 08:10:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E8792E0C6E; Thu, 10 Dec 2015 08:10:00 +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: Thu, 10 Dec 2015 08:10:04 -0000 Message-Id: In-Reply-To: <0e1823ffb49f43da888bf48ce11cf6f8@git.apache.org> References: <0e1823ffb49f43da888bf48ce11cf6f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] directory-kerby git commit: Merge remote-tracking branch 'asf/master' into pkinit-support Merge remote-tracking branch 'asf/master' into pkinit-support Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/dfb0555c Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/dfb0555c Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/dfb0555c Branch: refs/heads/pkinit-support Commit: dfb0555c62dc3697930200859019c4cdd829e337 Parents: c31c056 a21749c Author: plusplusjiajia Authored: Thu Dec 10 16:16:31 2015 +0800 Committer: plusplusjiajia Committed: Thu Dec 10 16:16:31 2015 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kerby/asn1/Asn1.java | 6 +- .../org/apache/kerby/asn1/Asn1Converter.java | 7 +- .../java/org/apache/kerby/asn1/Asn1Dumper.java | 5 +- .../main/java/org/apache/kerby/asn1/Tag.java | 10 ++ .../apache/kerby/asn1/parse/Asn1Container.java | 12 +-- .../org/apache/kerby/asn1/parse/Asn1Item.java | 17 +-- .../kerby/asn1/parse/Asn1ParseResult.java | 15 +++ .../kerby/asn1/type/AbstractAsn1Type.java | 5 + .../apache/kerby/asn1/type/Asn1Application.java | 57 ++++++++++ .../kerby/asn1/type/Asn1CollectionOf.java | 9 -- .../kerby/asn1/type/Asn1CollectionType.java | 4 +- .../apache/kerby/asn1/type/Asn1Constructed.java | 9 +- .../org/apache/kerby/asn1/type/Asn1Simple.java | 9 +- .../org/apache/kerby/asn1/TestAsn1Dump.java | 8 +- .../kerberos/kerb/codec/CodecTestUtil.java | 9 ++ .../kerberos/kerb/codec/TestAsReqCodec.java | 2 +- .../codec/TestPkinitAnonymousAsRepCodec.java | 89 +++++++++++++++ .../codec/TestPkinitAnonymousAsReqCodec.java | 107 +++++++++++++++++++ .../test/resources/pkinit_anonymous_asrep.token | 1 + .../test/resources/pkinit_anonymous_asreq.token | 1 + .../org/apache/kerby/cms/TestSignedData.java | 19 ++++ kerby-pkix/src/test/resources/anonymous.txt | 20 ++++ 22 files changed, 368 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/dfb0555c/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java ----------------------------------------------------------------------