Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 F05A518C1B for ; Mon, 30 Nov 2015 17:21:59 +0000 (UTC) Received: (qmail 9835 invoked by uid 500); 30 Nov 2015 17:21:59 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9660 invoked by uid 500); 30 Nov 2015 17:21:59 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 9522 invoked by uid 99); 30 Nov 2015 17:21:59 -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; Mon, 30 Nov 2015 17:21:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6E6FE0A1C; Mon, 30 Nov 2015 17:21:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Mon, 30 Nov 2015 17:22:01 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Fixing merge Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1c635e00 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1c635e00 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1c635e00 Branch: refs/heads/3.0.x-fixes Commit: 1c635e00afbaaa20a0bfe0e9a61b8cfbe0a2d233 Parents: 992739b Author: Colm O hEigeartaigh Authored: Mon Nov 30 17:21:47 2015 +0000 Committer: Colm O hEigeartaigh Committed: Mon Nov 30 17:21:47 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1c635e00/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java index 7a020ef..b17f7d3 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java @@ -386,16 +386,11 @@ public final class JwsUtils { && SignatureAlgorithm.NONE.getJwaName().equals(inHeaders.getAlgorithm())) { theVerifier = new NoneJwsSignatureVerifier(); } else { -<<<<<<< HEAD - theVerifier = getPublicKeySignatureVerifier( - KeyManagementUtils.loadPublicKey(m, props), - SignatureAlgorithm.getAlgorithm(signatureAlgo)); -======= X509Certificate[] certs = KeyManagementUtils.loadX509CertificateOrChain(m, props); if (certs != null && certs.length > 0) { - theVerifier = getPublicKeySignatureVerifier(certs[0], signatureAlgo); + theVerifier = getPublicKeySignatureVerifier(certs[0], + SignatureAlgorithm.getAlgorithm(signatureAlgo)); } ->>>>>>> a400eaa... Set a security context up from the JWS cert } } if (theVerifier == null && !ignoreNullVerifier) {