Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 06698761a -> 2cd0081cf
[CXF-6641] Using ContentAlgorithm.A128GCM.getJwaName() Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2cd0081c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2cd0081c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2cd0081c Branch: refs/heads/3.0.x-fixes Commit: 2cd0081cfd37c5ba6aa4d46038b64682aedfc631 Parents: 0669876 Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Wed Oct 14 16:22:51 2015 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Thu Oct 15 09:54:59 2015 +0100 ---------------------------------------------------------------------- .../rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2cd0081c/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java index 2c19541..9ad7ac9 100644 --- a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java +++ b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.cxf.rs.security.jose.jwa.AlgorithmUtils; +import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm; import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm; import org.apache.cxf.rs.security.jose.jwe.EcdhDirectKeyJweEncryption.EcdhHelper; import org.apache.cxf.rs.security.jose.jwk.JsonWebKey; @@ -57,7 +58,8 @@ public class EcdhAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvider KeyAlgorithm keyAlgo) { this.keyAlgo = keyAlgo; - helper = new EcdhHelper(peerPublicKey, curve, apuString, apvString, keyAlgo.getJwaName()); + helper = new EcdhHelper(peerPublicKey, curve, apuString, apvString, + ContentAlgorithm.A128GCM.getJwaName()); } @Override
