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 E9C41183BC for ; Wed, 24 Jun 2015 03:25:45 +0000 (UTC) Received: (qmail 62532 invoked by uid 500); 24 Jun 2015 03:25:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 62489 invoked by uid 500); 24 Jun 2015 03:25:44 -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 62408 invoked by uid 99); 24 Jun 2015 03:25:44 -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, 24 Jun 2015 03:25:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8738DE0501; Wed, 24 Jun 2015 03:25:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drankye@apache.org To: commits@directory.apache.org Date: Wed, 24 Jun 2015 03:25:45 -0000 Message-Id: In-Reply-To: <1fe193bc252e4140896d99a946fe7555@git.apache.org> References: <1fe193bc252e4140896d99a946fe7555@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] directory-kerby git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4832ef6c Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4832ef6c Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4832ef6c Branch: refs/heads/master Commit: 4832ef6c97920c89220f22d3e7f1998733af07e5 Parents: 9425e8a 6f15357 Author: Drankye Authored: Wed Jun 24 11:25:10 2015 +0800 Committer: Drankye Committed: Wed Jun 24 11:25:10 2015 +0800 ---------------------------------------------------------------------- .../kerb/identity/backend/JsonBackendTest.java | 11 +++++++++- .../kerby/kerberos/kerb/admin/KadminUtil.java | 2 +- .../kerberos/kerb/crypto/CheckSumTest.java | 21 ++++++++------------ .../kerberos/kerb/crypto/CheckSumsTest.java | 10 ++-------- .../kerberos/kerb/crypto/FastUtilTest.java | 2 -- .../kerberos/kerb/crypto/KeyDeriveTest.java | 4 +--- .../kerby/kerberos/kerb/crypto/PrfTest.java | 2 -- .../kerberos/kerb/util/NewEncryptionTest.java | 14 ++++++------- .../kerberos/provider/token/TokenTest.java | 12 ----------- 9 files changed, 28 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4832ef6c/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java ---------------------------------------------------------------------- diff --cc kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java index a6bbe77,63f545f..620ab0c --- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java +++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/KadminUtil.java @@@ -112,18 -121,12 +112,18 @@@ public final class KadminUtil keytab = Keytab.loadKeytab(keytabFile); } } catch (IOException e) { - throw new KrbException("Failed to load keytab", e); + throw new KrbException("Failed to load or create keytab", e); } + return keytab; + } + + static void exportToKeytab(Keytab keytab, KrbIdentity identity) + throws KrbException { + //Add principal to keytab. PrincipalName principal = identity.getPrincipal(); - KerberosTime timestamp = new KerberosTime(); + KerberosTime timestamp = KerberosTime.now(); for (EncryptionType encType : identity.getKeys().keySet()) { EncryptionKey ekey = identity.getKeys().get(encType); int keyVersion = ekey.getKvno();