Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D32E018637 for ; Wed, 14 Oct 2015 15:23:11 +0000 (UTC) Received: (qmail 9216 invoked by uid 500); 14 Oct 2015 15:23:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9159 invoked by uid 500); 14 Oct 2015 15:23:11 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 9150 invoked by uid 99); 14 Oct 2015 15:23:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Oct 2015 15:23:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D623DFFA2; Wed, 14 Oct 2015 15:23:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6641] Using ContentAlgorithm.A128GCM.getJwaName() Date: Wed, 14 Oct 2015 15:23:10 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 8ab6d218c -> f60dca758 [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/f60dca75 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f60dca75 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f60dca75 Branch: refs/heads/master Commit: f60dca7584f7792e56cb00cfdfbcf6a2bfe6e939 Parents: 8ab6d21 Author: Sergey Beryozkin Authored: Wed Oct 14 16:22:51 2015 +0100 Committer: Sergey Beryozkin Committed: Wed Oct 14 16:22:51 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/f60dca75/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