cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: CXF-7294 - Incorrect header parameter for Jose ECDH KA public key
Date Wed, 22 Mar 2017 13:10:46 GMT
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 <coheigea@apache.org>
Authored: Wed Mar 22 13:10:27 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
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());


Mime
View raw message