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 2014/10/22 18:11:28 UTC
[2/2] git commit: Updating JWE ContentDecryptionAlgorithm to return
the algo it actually supports
Updating JWE ContentDecryptionAlgorithm to return the algo it actually supports
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e125ae55
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e125ae55
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e125ae55
Branch: refs/heads/master
Commit: e125ae55fb591173bdce691ceda7a8954e2877b9
Parents: 2939492
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Oct 22 17:10:27 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Oct 22 17:10:27 2014 +0100
----------------------------------------------------------------------
.../cxf/rs/security/jose/jwe/ContentEncryptionAlgorithm.java | 1 -
.../rs/security/jose/jwe/ContentEncryptionCipherProperties.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e125ae55/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionAlgorithm.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionAlgorithm.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionAlgorithm.java
index 07b370e..6f53f53 100644
--- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionAlgorithm.java
+++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionAlgorithm.java
@@ -21,7 +21,6 @@ package org.apache.cxf.rs.security.jose.jwe;
public interface ContentEncryptionAlgorithm extends ContentEncryptionCipherProperties {
- String getAlgorithm();
byte[] getInitVector();
byte[] getContentEncryptionKey(JweHeaders headers);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/e125ae55/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionCipherProperties.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionCipherProperties.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionCipherProperties.java
index 14ea8f3..89d70f4 100644
--- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionCipherProperties.java
+++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/ContentEncryptionCipherProperties.java
@@ -22,7 +22,7 @@ import java.security.spec.AlgorithmParameterSpec;
public interface ContentEncryptionCipherProperties {
+ String getAlgorithm();
byte[] getAdditionalAuthenticationData(String headersJson);
AlgorithmParameterSpec getAlgorithmParameterSpec(byte[] iv);
- String getAlgorithm();
}