cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [2/2] git commit: Updating JWE ContentDecryptionAlgorithm to return the algo it actually supports
Date Wed, 22 Oct 2014 16:12:14 GMT
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/af03934b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af03934b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af03934b

Branch: refs/heads/3.0.x-fixes
Commit: af03934b7f45ca306b412c789f6a77fb71f3614e
Parents: a01a089
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Oct 22 17:10:27 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Oct 22 17:11:55 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/af03934b/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/af03934b/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();
 }


Mime
View raw message