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 18:23:14 UTC
[1/2] cxf git commit: Picking up latest changes from WSS4J
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 85ad51533 -> dbc867f98
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/24c8f27b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24c8f27b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24c8f27b
Branch: refs/heads/3.1.x-fixes
Commit: 24c8f27b813fc5cd61063bcaf78e4451a04e495c
Parents: 85ad515
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:54 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/24c8f27b/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 21fbd30..2643422 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);
@@ -506,7 +506,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);
}
@@ -519,7 +519,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);
}
@@ -579,7 +579,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/24c8f27b/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 54a7e14..0728b1d 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);
[2/2] cxf git commit: Updating to WSS4J SNAPSHOT
Posted by co...@apache.org.
Updating to WSS4J SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dbc867f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dbc867f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dbc867f9
Branch: refs/heads/3.1.x-fixes
Commit: dbc867f9882575625032e8e29321ad28f1d039b1
Parents: 24c8f27
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 21 17:52:03 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 21 17:52:03 2016 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dbc867f9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 20c1458..89f6a5b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
<cxf.woodstox.core.version>4.4.1</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.1.7</cxf.wss4j.version>
+ <cxf.wss4j.version>2.1.8-SNAPSHOT</cxf.wss4j.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
<cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>