Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a565df85a -> 8ec192c8a
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/a4172fa1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4172fa1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4172fa1 Branch: refs/heads/3.0.x-fixes Commit: a4172fa1a7e926cbeb4ba3a21268f48035c0deb4 Parents: a565df8 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Nov 21 17:51:21 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Nov 21 19:21:55 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/a4172fa1/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 199623f..6ea39c2 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 @@ -400,7 +400,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); } @@ -420,7 +420,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); @@ -493,7 +493,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); } @@ -506,7 +506,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); } @@ -563,7 +563,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/a4172fa1/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 0ae599b..083f43e 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 @@ -246,10 +246,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); @@ -482,7 +482,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); @@ -587,7 +587,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);
