git commit: [CXF-5954] Adding a system test with JWK AesWrap
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes af4f8391c -> 91c4d3019
[CXF-5954] Adding a system test with JWK AesWrap
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91c4d301
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91c4d301
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91c4d301
Branch: refs/heads/3.0.x-fixes
Commit: 91c4d3019a2cc058566e7cd4e3b860329639cf92
Parents: af4f839
Author: Sergey Beryozkin
Authored: Fri Sep 5 17:39:09 2014 +0100
Committer: Sergey Beryozkin
Committed: Fri Sep 5 17:41:05 2014 +0100
--
.../oauth2/jwe/ContentEncryptionAlgorithm.java | 2 +-
.../jwe/ContentEncryptionCipherProperties.java | 2 +-
.../oauth2/jwe/KeyEncryptionAlgorithm.java | 2 +-
.../cxf/rs/security/oauth2/jwk/JsonWebKey.java | 7
.../jwt/jaxrs/AbstractJweDecryptingFilter.java | 28 ---
.../oauth2/jwt/jaxrs/JweWriterInterceptor.java | 38 ++--
.../oauth2/utils/crypto/CryptoUtils.java| 34 +-
.../jaxrs/security/jwt/JAXRSJweJwsTest.java | 26 --
.../cxf/systest/jaxrs/security/jwt/server.xml | 14 +++-
.../jaxrs/security/certs/jwkPrivateSet.txt | 7 +++-
.../jaxrs/security/secret.jwk.properties| 21 +++
11 files changed, 143 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c4d301/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
index 1fcf25c..e76f8c9 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
@@ -20,7 +20,7 @@ package org.apache.cxf.rs.security.oauth2.jwe;
-interface ContentEncryptionAlgorithm extends ContentEncryptionCipherProperties
{
+public interface ContentEncryptionAlgorithm extends
ContentEncryptionCipherProperties {
byte[] getInitVector();
byte[] getContentEncryptionKey(JweHeaders headers);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c4d301/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
index 6cbe869..aae888a 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
@@ -21,7 +21,7 @@ package org.apache.cxf.rs.security.oauth2.jwe;
import java.security.spec.AlgorithmParameterSpec;
-interface ContentEncryptionCipherProperties {
+public interface ContentEncryptionCipherProperties {
byte[] getAdditionalAuthenticationData(String headersJson);
AlgorithmParameterSpec getAlgorithmParameterSpec(byte[] iv);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c4d301/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
index 2bc4d16..55c066e 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
@@ -19,6 +19,6 @@
package org.apache.cxf.rs.security.oauth2.jwe;
-interface KeyEncryptionAlgorithm {
+public interface KeyEncryptionAlgorithm {
byte[] getEncryptedContentEncryptionKey(JweHeaders headers, byte[] cek);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/91c4d301/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/
git commit: [CXF-5954] Adding a system test with JWK AesWrap
Repository: cxf
Updated Branches:
refs/heads/master 640113292 -> 21a099e9b
[CXF-5954] Adding a system test with JWK AesWrap
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/21a099e9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21a099e9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21a099e9
Branch: refs/heads/master
Commit: 21a099e9b66964ff6f41786272c16652c6e209ed
Parents: 6401132
Author: Sergey Beryozkin
Authored: Fri Sep 5 17:39:09 2014 +0100
Committer: Sergey Beryozkin
Committed: Fri Sep 5 17:39:09 2014 +0100
--
.../oauth2/jwe/ContentEncryptionAlgorithm.java | 2 +-
.../jwe/ContentEncryptionCipherProperties.java | 2 +-
.../oauth2/jwe/KeyEncryptionAlgorithm.java | 2 +-
.../cxf/rs/security/oauth2/jwk/JsonWebKey.java | 7
.../jwt/jaxrs/AbstractJweDecryptingFilter.java | 28 ---
.../oauth2/jwt/jaxrs/JweWriterInterceptor.java | 38 ++--
.../oauth2/utils/crypto/CryptoUtils.java| 34 +-
.../jaxrs/security/jwt/JAXRSJweJwsTest.java | 26 --
.../cxf/systest/jaxrs/security/jwt/server.xml | 14 +++-
.../jaxrs/security/certs/jwkPrivateSet.txt | 7 +++-
.../jaxrs/security/secret.jwk.properties| 21 +++
11 files changed, 143 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/21a099e9/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
index 1fcf25c..e76f8c9 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionAlgorithm.java
@@ -20,7 +20,7 @@ package org.apache.cxf.rs.security.oauth2.jwe;
-interface ContentEncryptionAlgorithm extends ContentEncryptionCipherProperties
{
+public interface ContentEncryptionAlgorithm extends
ContentEncryptionCipherProperties {
byte[] getInitVector();
byte[] getContentEncryptionKey(JweHeaders headers);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/21a099e9/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
index 6cbe869..aae888a 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/ContentEncryptionCipherProperties.java
@@ -21,7 +21,7 @@ package org.apache.cxf.rs.security.oauth2.jwe;
import java.security.spec.AlgorithmParameterSpec;
-interface ContentEncryptionCipherProperties {
+public interface ContentEncryptionCipherProperties {
byte[] getAdditionalAuthenticationData(String headersJson);
AlgorithmParameterSpec getAlgorithmParameterSpec(byte[] iv);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/21a099e9/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
index 2bc4d16..55c066e 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/KeyEncryptionAlgorithm.java
@@ -19,6 +19,6 @@
package org.apache.cxf.rs.security.oauth2.jwe;
-interface KeyEncryptionAlgorithm {
+public interface KeyEncryptionAlgorithm {
byte[] getEncryptedContentEncryptionKey(JweHeaders headers, byte[] cek);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/21a099e9/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/securit
