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 74BEC200B45 for ; Thu, 30 Jun 2016 10:53:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 73AB3160A51; Thu, 30 Jun 2016 08:53:53 +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 24783160A76 for ; Thu, 30 Jun 2016 10:53:50 +0200 (CEST) Received: (qmail 98152 invoked by uid 500); 30 Jun 2016 08:53:50 -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 96525 invoked by uid 99); 30 Jun 2016 08:53:49 -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, 30 Jun 2016 08:53:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3E3A3EC22D; Thu, 30 Jun 2016 08:53:49 +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: Thu, 30 Jun 2016 08:54:27 -0000 Message-Id: <608b9fee1fa743bfaf195a45d6386606@git.apache.org> In-Reply-To: <19c327db7623444a91b9a5859944fa8f@git.apache.org> References: <19c327db7623444a91b9a5859944fa8f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [40/44] directory-kerby git commit: Fixing warnings archived-at: Thu, 30 Jun 2016 08:53:53 -0000 Fixing warnings Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/f39f0058 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/f39f0058 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/f39f0058 Branch: refs/heads/gssapi Commit: f39f0058f7f9a8b3c4c10279d4ac1abb3af9800a Parents: c4865eb Author: Colm O hEigeartaigh Authored: Fri Jun 17 11:42:51 2016 +0100 Committer: Colm O hEigeartaigh Committed: Fri Jun 17 11:42:51 2016 +0100 ---------------------------------------------------------------------- .../kerb/server/preauth/pkinit/PkinitPreauth.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f39f0058/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java ---------------------------------------------------------------------- diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java index fa93780..f0080c9 100644 --- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java +++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/pkinit/PkinitPreauth.java @@ -252,7 +252,7 @@ public class PkinitPreauth extends AbstractPreauthPlugin { String identity = pkinitContext.identityOpts.identity; - PaPkAsRep paPkAsRep = makePaPkAsRep(pkinitContext.cryptoctx, serverPubKey, identity); + PaPkAsRep paPkAsRep = makePaPkAsRep(serverPubKey, identity); PaDataEntry paDataEntry = makeEntry(paPkAsRep); kdcRequest.getPreauthContext().getOutputPaData().add(paDataEntry); @@ -300,16 +300,14 @@ public class PkinitPreauth extends AbstractPreauthPlugin { return paDataEntry; } - private PaPkAsRep makePaPkAsRep(PkinitPlgCryptoContext cryptoContext, - DHPublicKey severPubKey, String identityString) throws KrbException { + private PaPkAsRep makePaPkAsRep(DHPublicKey severPubKey, String identityString) throws KrbException { List identityList = Arrays.asList(identityString.split(",")); List certificates = new ArrayList<>(); for (String identity : identityList) { File file = new File(identity); - try { - Scanner scanner = new Scanner(file, "UTF-8"); + try (Scanner scanner = new Scanner(file, "UTF-8")) { String found = scanner.findInLine("CERTIFICATE"); if (found != null) { @@ -353,7 +351,7 @@ public class PkinitPreauth extends AbstractPreauthPlugin { certificateSet.addElement(certificateChoices); } - String oid = cryptoContext.getIdPkinitDHKeyDataOID(); + String oid = PkinitPlgCryptoContext.getIdPkinitDHKeyDataOID(); signedDataBytes = PkinitCrypto.cmsSignedDataCreate(KrbCodec.encode(kdcDhKeyInfo), oid, 3, null, null, null, null);