[2/3] cxf git commit: CXF-7294 - Incorrect header parameter for Jose ECDH KA public key

[coheigea]

CXF-7294 - Incorrect header parameter for Jose ECDH KA public key

# Conflicts:
#   
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d810eef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d810eef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d810eef

Branch: refs/heads/3.1.x-fixes
Commit: 7d810eef57861e0ea2381803d31ef0673b980f27
Parents: c627cb1
Author: Colm O hEigeartaigh 
Authored: Wed Mar 22 13:10:27 2017 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:11:23 2017 +

--
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweDecryption.java   | 2 +-
 .../cxf/rs/security/jose/jwe/EcdhDirectKeyJweEncryption.java   | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7d810eef/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 85485e0..13a0107 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/7d810eef/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 39b6928..ad7eb02 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,9 +95,15 @@ 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());
 
 }

cxf git commit: CXF-7294 - Incorrect header parameter for Jose ECDH KA public key

[coheigea]

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 +
Committer: Colm O hEigeartaigh 
Committed: Wed Mar 22 13:10:43 2017 +

--
 .../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());