cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] cxf git commit: Switch to use PrivateKey instead
Date Thu, 18 Feb 2016 10:38:23 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 36f19c44c -> 80b1e89db


Switch to use PrivateKey instead

# Conflicts:
#	rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0cbc65cf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0cbc65cf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0cbc65cf

Branch: refs/heads/3.0.x-fixes
Commit: 0cbc65cf8dc6b19fa3cc24d54971e7e4d5ee792f
Parents: 36f19c4
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Feb 18 10:32:47 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Feb 18 10:36:53 2016 +0000

----------------------------------------------------------------------
 .../cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0cbc65cf/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
index 247f84b..d8cd8a7 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
@@ -17,7 +17,12 @@
  * under the License.
  */
 package org.apache.cxf.rs.security.jose.jwe;
+<<<<<<< HEAD
 import java.security.interfaces.RSAPrivateKey;
+=======
+import java.nio.charset.StandardCharsets;
+import java.security.PrivateKey;
+>>>>>>> 43d17e6... Switch to use PrivateKey instead
 
 import javax.crypto.SecretKey;
 
@@ -38,7 +43,7 @@ public class JweJwtCompactConsumer  {
         return decryptWith(JweUtils.createJweDecryptionProvider(key, 
                                headers.getContentEncryptionAlgorithm()));
     }
-    public JwtToken decryptWith(RSAPrivateKey key) {
+    public JwtToken decryptWith(PrivateKey key) {
         return decryptWith(JweUtils.createJweDecryptionProvider(key, 
                                headers.getKeyEncryptionAlgorithm(),
                                headers.getContentEncryptionAlgorithm()));


Mime
View raw message