Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 24c65ee57 -> 184f5126d
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/184f5126 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/184f5126 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/184f5126 Branch: refs/heads/3.0.x-fixes Commit: 184f5126dd1b12676e6f59dabc28631d5b0a4915 Parents: 24c65ee Author: Sergey Beryozkin <[email protected]> Authored: Wed Apr 29 09:56:04 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Apr 29 09:58:20 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/184f5126/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/184f5126/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) {
