Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 2e7e04b54 -> b4e7dffba
Enabling encryption serializers for outbound Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4e7dffb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4e7dffb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4e7dffb Branch: refs/heads/3.1.x-fixes Commit: b4e7dffbaeae4fdf1a20d70cef51e2e44e8960bc Parents: 2e7e04b Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Jun 13 12:27:55 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Jun 13 12:28:44 2016 +0100 ---------------------------------------------------------------------- .../security/wss4j/policyhandlers/AsymmetricBindingHandler.java | 3 +++ .../ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b4e7dffb/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 f0f0a74..c31d33d 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 @@ -43,6 +43,7 @@ import org.apache.cxf.ws.policy.AssertionInfoMap; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler; +import org.apache.cxf.ws.security.wss4j.StaxSerializer; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.derivedKey.ConversationConstants; @@ -444,6 +445,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { } else { try { WSSecEncrypt encr = new WSSecEncrypt(); + encr.setEncryptionSerializer(new StaxSerializer()); encr.setIdAllocator(wssConfig.getIdAllocator()); encr.setCallbackLookup(callbackLookup); encr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message)); @@ -552,6 +554,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder { AlgorithmSuite algorithmSuite) { try { WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(); + dkEncr.setEncryptionSerializer(new StaxSerializer()); dkEncr.setIdAllocator(wssConfig.getIdAllocator()); dkEncr.setCallbackLookup(callbackLookup); dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message)); http://git-wip-us.apache.org/repos/asf/cxf/blob/b4e7dffb/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 789b9ff..afda195 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 @@ -42,6 +42,7 @@ import org.apache.cxf.ws.security.policy.PolicyUtils; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.cxf.ws.security.wss4j.AttachmentCallbackHandler; +import org.apache.cxf.ws.security.wss4j.StaxSerializer; import org.apache.wss4j.common.WSEncryptionPart; import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.crypto.Crypto; @@ -401,6 +402,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { boolean atEnd) { try { WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(); + dkEncr.setEncryptionSerializer(new StaxSerializer()); dkEncr.setIdAllocator(wssConfig.getIdAllocator()); dkEncr.setCallbackLookup(callbackLookup); dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message)); @@ -517,6 +519,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { } else { try { WSSecEncrypt encr = new WSSecEncrypt(); + encr.setEncryptionSerializer(new StaxSerializer()); encr.setIdAllocator(wssConfig.getIdAllocator()); encr.setCallbackLookup(callbackLookup); encr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
