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 19:22:15 UTC
[1/3] cxf git commit: Picking up latest changes from WSS4J
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 <co...@apache.org>
Authored: Mon Nov 21 17:51:21 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
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);
[3/3] cxf git commit: Updating WSS4J SNAPSHOT
Posted by co...@apache.org.
Updating WSS4J SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ec192c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ec192c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ec192c8
Branch: refs/heads/3.0.x-fixes
Commit: 8ec192c8a3d235643d9f4f3d83517402a5b80e07
Parents: 3412672
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 21 19:22:04 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 21 19:22:04 2016 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8ec192c8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4a28b60..93b4f71 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -164,7 +164,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.0.9</cxf.wss4j.version>
+ <cxf.wss4j.version>2.0.10-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>
[2/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3412672d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3412672d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3412672d
Branch: refs/heads/3.0.x-fixes
Commit: 3412672d3a66e83fec5da5307b0e1233c9e4969b
Parents: a4172fa
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 21 19:21:56 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 21 19:21:56 2016 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3412672d/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e4e6113..2a52264 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1113,6 +1113,7 @@ B daf19cc33f77e2b4ddd2e2b583926be189b84abb
B db18a965fb238b8515ab74eb63d13c863c279476
B db51e1a99ab886f179c677579ba798b450069287
B db8fca38f64cae8cdfc846774db6625cec5d387c
+B dbc867f9882575625032e8e29321ad28f1d039b1
B dbe659d16f536944afaee85d76715558761936c6
B dbf8d58d565ba7f3a8c43b917f7e9182cabe5efa
B dbfaf2b5aea3c4b09a825c82cae88c9d5f777aac