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 <[email protected]> Authored: Wed Mar 22 13:12:08 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> 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()); }
