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 484D11848C for ; Wed, 29 Apr 2015 10:50:40 +0000 (UTC) Received: (qmail 51148 invoked by uid 500); 29 Apr 2015 10:00:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 12764 invoked by uid 500); 29 Apr 2015 09:59:04 -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 668 invoked by uid 99); 29 Apr 2015 08:56:24 -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, 29 Apr 2015 08:56:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89A6FDFF12; Wed, 29 Apr 2015 08:56:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <35e7774a54854e0dbcf54c956509b05a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Fixing a build failure Date: Wed, 29 Apr 2015 08:56:24 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master ac8f8fbc9 -> c9d6557b6 Fixing a build failure Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c9d6557b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c9d6557b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c9d6557b Branch: refs/heads/master Commit: c9d6557b6d492ff3beabe25ae257481915d2a84e Parents: ac8f8fb Author: Sergey Beryozkin Authored: Wed Apr 29 09:56:04 2015 +0100 Committer: Sergey Beryozkin Committed: Wed Apr 29 09:56:04 2015 +0100 ---------------------------------------------------------------------- .../cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java | 4 +--- .../cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c9d6557b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java index 7347229..9c5d233 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/JwtRequestCodeFilter.java @@ -19,7 +19,6 @@ package org.apache.cxf.rs.security.oauth2.grants.code; import java.security.cert.X509Certificate; -import java.security.interfaces.RSAPublicKey; import java.util.List; import java.util.Map; @@ -120,8 +119,7 @@ public class JwtRequestCodeFilter implements AuthorizationCodeRequestFilter { } else if (verifyWithClientCertificates) { X509Certificate cert = (X509Certificate)CryptoUtils.decodeCertificate(c.getApplicationCertificates().get(0)); - return JwsUtils.getRSAKeySignatureVerifier((RSAPublicKey)cert.getPublicKey(), - AlgorithmUtils.RS_SHA_256_ALGO); + return JwsUtils.getPublicKeySignatureVerifier(cert, AlgorithmUtils.RS_SHA_256_ALGO); } return JwsUtils.loadSignatureVerifier(true); } http://git-wip-us.apache.org/repos/asf/cxf/blob/c9d6557b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java index 6cd5f30..03bf726 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java @@ -87,7 +87,7 @@ public final class JwtAccessTokenUtils { Client client, RSAPrivateKey key) { JwsSignatureProvider jws = - JwsUtils.getRSAKeySignatureProvider(key, AlgorithmUtils.RS_SHA_256_ALGO); + JwsUtils.getPrivateKeySignatureProvider(key, AlgorithmUtils.RS_SHA_256_ALGO); return signToAccessToken(jwt, client, jws); } @@ -98,7 +98,7 @@ public final class JwtAccessTokenUtils { return toAccessToken(jwt, client, jwtString); } public static JwtToken verifyAccessToken(String tokenId, RSAPublicKey key) { - JwsSignatureVerifier jws = JwsUtils.getRSAKeySignatureVerifier(key, AlgorithmUtils.RS_SHA_256_ALGO); + JwsSignatureVerifier jws = JwsUtils.getPublicKeySignatureVerifier(key, AlgorithmUtils.RS_SHA_256_ALGO); return verifyAccessToken(tokenId, jws); } public static JwtToken verifyAccessToken(String tokenId, JwsSignatureVerifier jws) {