[axis-axis2-java-rampart] branch master updated: Fixes for OMNode and WSSec code issues with wss4j upgrade

[robertlazarski]

This is an automated email from the ASF dual-hosted git repository.

robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git


The following commit(s) were added to refs/heads/master by this push:
     new 852a9d2c Fixes for OMNode and WSSec code issues with wss4j upgrade
     new 74b97b87 Merge pull request #6 from bill-looby/master
852a9d2c is described below

commit 852a9d2ce05b1cf44142776388c04c5387396160
Author: Bill Looby <blooby@localhost.localdomain>
AuthorDate: Fri Oct 13 21:33:47 2023 +0100

    Fixes for OMNode and WSSec code issues with wss4j upgrade
---
 .../main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java  | 2 +-
 .../src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
 
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
index 003f28ce..007a1282 100644
--- 
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
+++ 
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
@@ -693,7 +693,7 @@ public class AsymmetricBindingBuilder extends 
BindingBuilder {
                 setupEncryptedKey(rmd, sigToken);
             }
             
-            WSSecDKSign dkSign = new WSSecDKSign(doc);
+            WSSecDKSign dkSign = new WSSecDKSign(rmd.getSecHeader());
 
             dkSign.setTokenIdentifier(this.encryptedKeyId);
 
diff --git 
a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
 
b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
index 82ed8c8d..90c23108 100644
--- 
a/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
+++ 
b/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
@@ -541,7 +541,7 @@ public class SAML2TokenIssuer implements TokenIssuer {
 
             //Marshall and Sign
             Marshaller marshaller = 
XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(assertion);
-            marshaller.marshall(assertion);
+            marshaller.marshall(assertion,document);
 
             Signer.signObjects(signatureList);