You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2015/02/16 17:31:38 UTC
cxf git commit: Fixing the build failure on the trunk
Repository: cxf
Updated Branches:
refs/heads/master 13625b81f -> 7dddceb0a
Fixing the build failure on the trunk
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7dddceb0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7dddceb0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7dddceb0
Branch: refs/heads/master
Commit: 7dddceb0a7bf153c12250d396d02b0c31ce72f14
Parents: 13625b8
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Mon Feb 16 16:31:16 2015 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Mon Feb 16 16:31:16 2015 +0000
----------------------------------------------------------------------
.../cxf/rs/security/oauth2/tokens/jwt/JwtAccessTokenUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7dddceb0/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 ddd3c51..ca2d1ab 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
@@ -26,7 +26,7 @@ import javax.crypto.SecretKey;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.rs.security.jose.JoseConstants;
import org.apache.cxf.rs.security.jose.jwa.Algorithm;
-import org.apache.cxf.rs.security.jose.jwe.DirectKeyJweDecryption;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryption;
import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
import org.apache.cxf.rs.security.jose.jwe.JweUtils;
@@ -75,7 +75,7 @@ public final class JwtAccessTokenUtils {
return new BearerAccessToken(client, tokenId, issuedAt, expiresIn);
}
public static JwtToken decryptFromfromAccessToken(String tokenId, SecretKey key) {
- DirectKeyJweDecryption jweDecryption = JweUtils.getDirectKeyJweDecryption(key, Algorithm.A128GCM.getJwtName());
+ JweDecryption jweDecryption = JweUtils.getDirectKeyJweDecryption(key, Algorithm.A128GCM.getJwtName());
return decryptFromAccessToken(tokenId, jweDecryption);
}
public static JwtToken decryptFromAccessToken(String tokenId, JweDecryptionProvider jweDecryption) {