From commits-return-45537-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Wed Mar 22 13:10:47 2017 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 3CC571907C for ; Wed, 22 Mar 2017 13:10:47 +0000 (UTC) Received: (qmail 72736 invoked by uid 500); 22 Mar 2017 13:10:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 72678 invoked by uid 500); 22 Mar 2017 13:10:47 -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 72669 invoked by uid 99); 22 Mar 2017 13:10:47 -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:10:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9FC8DFE1D; Wed, 22 Mar 2017 13:10:46 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: CXF-7294 - Incorrect header parameter for Jose ECDH KA public key Date: Wed, 22 Mar 2017 13:10:46 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 137485de3 -> a2efc18ef CXF-7294 - Incorrect header parameter for Jose ECDH KA public key Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a2efc18e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a2efc18e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a2efc18e Branch: refs/heads/master Commit: a2efc18eff09700eded186478a7c2ae8fa543eef Parents: 137485d Author: Colm O hEigeartaigh Authored: Wed Mar 22 13:10:27 2017 +0000 Committer: Colm O hEigeartaigh Committed: Wed Mar 22 13:10:43 2017 +0000 ---------------------------------------------------------------------- .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java | 2 +- .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a2efc18e/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java index 804532d..c802b11 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java @@ -34,7 +34,7 @@ public class EcdhDirectKeyJweDecryption extends JweDecryption { protected static byte[] getDecryptedContentEncryptionKeyFromHeaders(JweHeaders headers, ECPrivateKey privateKey) { ContentAlgorithm jwtAlgo = headers.getContentEncryptionAlgorithm(); - JsonWebKey publicJwk = headers.getJsonWebKey("epv"); + JsonWebKey publicJwk = headers.getJsonWebKey("epk"); String apuHeader = (String)headers.getHeader("apu"); byte[] apuBytes = apuHeader == null ? null : JoseUtils.decode(apuHeader); String apvHeader = (String)headers.getHeader("apv"); http://git-wip-us.apache.org/repos/asf/cxf/blob/a2efc18e/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 77b3fd2..c2a8126 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,7 +95,7 @@ public class EcdhDirectKeyJweEncryption extends JweEncryption { headers.setHeader("apu", Base64UrlUtility.encode(apuBytes)); headers.setHeader("apv", Base64UrlUtility.encode(apvBytes)); - headers.setJsonWebKey("epv", JwkUtils.fromECPublicKey(publicKey, ecurve)); + headers.setJsonWebKey("epk", JwkUtils.fromECPublicKey(publicKey, ecurve)); return JweUtils.getECDHKey(privateKey, peerPublicKey, apuBytes, apvBytes, jwtAlgo.getJwaName(), jwtAlgo.getKeySizeBits());