Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9E7A7200C4E for ; Wed, 22 Mar 2017 14:12:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9D104160B86; Wed, 22 Mar 2017 13:12:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EDA2C160B83 for ; Wed, 22 Mar 2017 14:12:17 +0100 (CET) Received: (qmail 74977 invoked by uid 500); 22 Mar 2017 13:12:17 -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 74836 invoked by uid 99); 22 Mar 2017 13:12:17 -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, 22 Mar 2017 13:12:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F1728DFF77; Wed, 22 Mar 2017 13:12:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 22 Mar 2017 13:12:18 -0000 Message-Id: <9c170e98a68b4928b8f7ec5881c71754@git.apache.org> In-Reply-To: <825ef8a0e9814b64ae368cf841c419e4@git.apache.org> References: <825ef8a0e9814b64ae368cf841c419e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cxf git commit: Fixing merge archived-at: Wed, 22 Mar 2017 13:12:18 -0000 Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8f4ca20d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8f4ca20d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8f4ca20d Branch: refs/heads/3.1.x-fixes Commit: 8f4ca20d84de9e232122813b2a1b991d124955fc Parents: 0afa064 Author: Colm O hEigeartaigh Authored: Wed Mar 22 13:12:08 2017 +0000 Committer: Colm O hEigeartaigh Committed: Wed Mar 22 13:12:08 2017 +0000 ---------------------------------------------------------------------- .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8f4ca20d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java index ad7eb02..8b807bd 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java @@ -95,15 +95,9 @@ public class EcdhDirectKeyJweEncryption extends JweEncryption { headers.setHeader("apu", Base64UrlUtility.encode(apuBytes)); headers.setHeader("apv", Base64UrlUtility.encode(apvBytes)); -<<<<<<< HEAD - headers.setJsonWebKey("epv", JwkUtils.fromECPublicKey(publicKey, ecurve)); - - return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, apvBytes, -======= headers.setJsonWebKey("epk", JwkUtils.fromECPublicKey(publicKey, ecurve)); return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, apvBytes, ->>>>>>> a2efc18... CXF-7294 - Incorrect header parameter for Jose ECDH KA public key jwtAlgo.getJwaName(), jwtAlgo.getKeySizeBits()); }