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 2016/11/21 17:51:42 UTC
cxf git commit: Picking up latest changes from WSS4J
Repository: cxf
Updated Branches:
refs/heads/master f3fe38673 -> 040a1d9ef
Picking up latest changes from WSS4J
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/040a1d9e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/040a1d9e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/040a1d9e
Branch: refs/heads/master
Commit: 040a1d9ef67400a2b8fe47b811c918e9bead1528
Parents: f3fe386
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 21 17:51:21 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 21 17:51:35 2016 +0000
----------------------------------------------------------------------
.../wss4j/policyhandlers/AsymmetricBindingHandler.java | 10 +++++-----
.../wss4j/policyhandlers/SymmetricBindingHandler.java | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/040a1d9e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 33d3ea5..cafa16b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -404,7 +404,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
&& encrBase instanceof WSSecDKEncrypt) {
try {
Element secondRefList =
- ((WSSecDKEncrypt)encrBase).encryptForExternalRef(null, secondEncrParts);
+ ((WSSecDKEncrypt)encrBase).encryptForExternalRef(null, secondEncrParts, secHeader);
if (secondRefList != null) {
((WSSecDKEncrypt)encrBase).addExternalRefElement(secondRefList, secHeader);
}
@@ -424,7 +424,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
} else {
this.insertBeforeBottomUp(secondRefList);
}
- ((WSSecEncrypt)encrBase).encryptForRef(secondRefList, secondEncrParts);
+ ((WSSecEncrypt)encrBase).encryptForRef(secondRefList, secondEncrParts, secHeader);
} catch (WSSecurityException ex) {
LOG.log(Level.FINE, ex.getMessage(), ex);
@@ -505,7 +505,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
List<Element> attachments = encr.getAttachmentEncryptedDataElements();
//Encrypt, get hold of the ref list and add it
if (externalRef) {
- Element refList = encr.encryptForRef(null, encrParts);
+ Element refList = encr.encryptForRef(null, encrParts, secHeader);
if (refList != null) {
insertBeforeBottomUp(refList);
}
@@ -518,7 +518,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
this.addEncryptedKeyElement(encryptedKeyElement);
}
} else {
- Element refList = encr.encryptForRef(null, encrParts);
+ Element refList = encr.encryptForRef(null, encrParts, secHeader);
if (refList != null || (attachments != null && !attachments.isEmpty())) {
this.addEncryptedKeyElement(encryptedKeyElement);
}
@@ -578,7 +578,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
dkEncr.prepare(saaj.getSOAPPart());
addDerivedKeyElement(dkEncr.getdktElement());
- Element refList = dkEncr.encryptForExternalRef(null, encrParts);
+ Element refList = dkEncr.encryptForExternalRef(null, encrParts, secHeader);
if (refList != null) {
insertBeforeBottomUp(refList);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/040a1d9e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
----------------------------------------------------------------------
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 c70b5f7..8bb6af2 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
@@ -251,10 +251,10 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
if (encryptionToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys
&& !secondEncrParts.isEmpty()) {
secondRefList = ((WSSecDKEncrypt)encr).encryptForExternalRef(null,
- secondEncrParts);
+ secondEncrParts, secHeader);
} else if (!secondEncrParts.isEmpty()) {
//Encrypt, get hold of the ref list and add it
- secondRefList = ((WSSecEncrypt)encr).encryptForRef(null, secondEncrParts);
+ secondRefList = ((WSSecEncrypt)encr).encryptForRef(null, secondEncrParts, secHeader);
}
if (secondRefList != null) {
this.addDerivedKeyElement(secondRefList);
@@ -491,7 +491,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
encrDKTokenElem = dkEncr.getdktElement();
addDerivedKeyElement(encrDKTokenElem);
- Element refList = dkEncr.encryptForExternalRef(null, encrParts);
+ Element refList = dkEncr.encryptForExternalRef(null, encrParts, secHeader);
List<Element> attachments = dkEncr.getAttachmentEncryptedDataElements();
addAttachmentsForEncryption(atEnd, refList, attachments);
@@ -601,7 +601,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
encr.prependBSTElementToHeader(secHeader);
}
- Element refList = encr.encryptForRef(null, encrParts);
+ Element refList = encr.encryptForRef(null, encrParts, secHeader);
List<Element> attachments = encr.getAttachmentEncryptedDataElements();
addAttachmentsForEncryption(atEnd, refList, attachments);