You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/08/19 11:50:52 UTC
[cxf] 02/11: Get the encrypted key SHA value directly from WSS4J
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch wss4j_2.3.0
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 187d3c1f52fa3500edeb450f615f6eafe1694300
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jan 25 11:27:40 2019 +0000
Get the encrypted key SHA value directly from WSS4J
---
parent/pom.xml | 5 ++---
.../ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8938529..4ceea7b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,8 +217,7 @@
<cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
- <cxf.wss4j.version>2.2.4</cxf.wss4j.version>
- <cxf.xalan.version>2.7.2</cxf.xalan.version>
+ <cxf.wss4j.version>2.3.0-SNAPSHOT</cxf.wss4j.version>
<cxf.xbean.version>4.14</cxf.xbean.version>
<cxf.xerces.version>2.12.0</cxf.xerces.version>
<cxf.xmlschema.version>2.2.4</cxf.xmlschema.version>
@@ -263,7 +262,7 @@
<cxf.xalan.bundle.version>2.7.2_3</cxf.xalan.bundle.version>
<cxf.xerces.bundle.version>2.12.0_1</cxf.xerces.bundle.version>
<cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
- <cxf.xmlsec.bundle.version>2.1.4</cxf.xmlsec.bundle.version>
+ <cxf.xmlsec.bundle.version>2.2.0-SNAPSHOT</cxf.xmlsec.bundle.version>
<cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
</properties>
<build>
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
index 87a6a30..cc37da2 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
@@ -932,7 +932,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
// Set the SHA1 value of the encrypted key, this is used when the encrypted
// key is referenced via a key identifier of type EncryptedKeySHA1
- tempTok.setSHA1(getSHA1(encrKey.getEncryptedEphemeralKey()));
+ tempTok.setSHA1(encrKey.getEncryptedKeySHA1());
tokenStore.add(tempTok);
// Create another cache entry with the SHA1 Identifier as the key for easy retrieval