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 2015/04/10 15:41:41 UTC
cxf git commit: Minor updates to JWE headers
Repository: cxf
Updated Branches:
refs/heads/master 9f18da888 -> e3624e62b
Minor updates to JWE headers
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e3624e62
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e3624e62
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e3624e62
Branch: refs/heads/master
Commit: e3624e62b97d4a0bb66d53115a4ece5595c25774
Parents: 9f18da8
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Fri Apr 10 14:41:27 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Fri Apr 10 14:41:27 2015 +0100
----------------------------------------------------------------------
.../cxf/rs/security/jose/jwe/JweHeaders.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e3624e62/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
index ead32de..b0bd902 100644
--- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
+++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweHeaders.java
@@ -26,6 +26,8 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.rs.security.jose.JoseConstants;
import org.apache.cxf.rs.security.jose.JoseHeaders;
import org.apache.cxf.rs.security.jose.JoseHeadersReaderWriter;
+import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
+import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
@@ -67,19 +69,33 @@ public class JweHeaders extends JoseHeaders {
public void setKeyEncryptionAlgorithm(String type) {
super.setAlgorithm(type);
}
+ public void setKeyEncryptionAlgorithm(KeyAlgorithm algo) {
+ this.setKeyEncryptionAlgorithm(algo.getJwaName());
+ }
public String getKeyEncryptionAlgorithm() {
return super.getAlgorithm();
}
+ public KeyAlgorithm getKeyEncryptionAlgorithmEnum() {
+ String algo = getKeyEncryptionAlgorithm();
+ return algo == null ? null : KeyAlgorithm.getAlgorithm(algo);
+ }
public void setContentEncryptionAlgorithm(String type) {
setHeader(JoseConstants.JWE_HEADER_CONTENT_ENC_ALGORITHM, type);
}
+ public void setContentEncryptionAlgorithm(ContentAlgorithm algo) {
+ this.setContentEncryptionAlgorithm(algo.getJwaName());
+ }
+
public String getContentEncryptionAlgorithm() {
return (String)getHeader(JoseConstants.JWE_HEADER_CONTENT_ENC_ALGORITHM);
}
-
+ public ContentAlgorithm getContentEncryptionAlgorithmEnum() {
+ String algo = getContentEncryptionAlgorithm();
+ return algo == null ? null : ContentAlgorithm.getAlgorithm(algo);
+ }
public void setZipAlgorithm(String type) {
setHeader(JoseConstants.JWE_HEADER_ZIP_ALGORITHM, type);
}