You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/02/18 11:38:23 UTC
[1/3] cxf git commit: Switch to use PrivateKey instead
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 <co...@apache.org>
Authored: Thu Feb 18 10:32:47 2016 +0000
Committer: Colm O hEigeartaigh <co...@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()));
[3/3] cxf git commit: Fixing merge
Posted by co...@apache.org.
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80b1e89d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80b1e89d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80b1e89d
Branch: refs/heads/3.0.x-fixes
Commit: 80b1e89db2dfdb7a907179c856c343138e39fa2d
Parents: b4b4a74
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 18 10:38:14 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 18 10:38:14 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/80b1e89d/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 d8cd8a7..681cc71 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,12 +17,7 @@
* 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;
[2/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4b4a74c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4b4a74c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4b4a74c
Branch: refs/heads/3.0.x-fixes
Commit: b4b4a74cd2b89fee0d3298153d3b0ff0f3849f57
Parents: 0cbc65c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 18 10:36:54 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 18 10:36:54 2016 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b4b4a74c/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2bdb7f3..d851f5b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -860,6 +860,7 @@ M 419478ede89bdedd5a6ac4f0c233005e7b62fc05
M 43097ecf7a0e5dc4cba2bdd6053c8b199f38ab58
M 431ade6fe85f4d13f56aa4bc530cb50353be0dd5
M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
+M 43d17e63214d8d79ac8796524c026830ffb1043a
M 44bf65e6dd21fbbde4c24685b20dcbcb0f0ccc1d
M 4640cf1ea20eee09ae650b706bce765a16affc8b
M 4685f06871bf35cee184d020fed025ae9491cb02