[ws-wss4j] branch master updated: WSS-699: org.apache.wss4j.dom.transform.STRTransform not compliant with Oracle spec (#181)

[coheigea]

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

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b15b9ebe WSS-699: org.apache.wss4j.dom.transform.STRTransform not 
compliant with Oracle spec (#181)
2b15b9ebe is described below

commit 2b15b9ebed595ff9b2e950845d704678d33e3385
Author: Luigi De Masi <5583341+luigidem...@users.noreply.github.com>
AuthorDate: Wed Jul 12 12:46:41 2023 +0200

    WSS-699: org.apache.wss4j.dom.transform.STRTransform not compliant with 
Oracle spec (#181)
---
 .../org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java | 2 +-
 .../wss4j/dom/transform/AttachmentCompleteSignatureTransform.java     | 4 +---
 .../wss4j/dom/transform/AttachmentContentSignatureTransform.java      | 3 +--
 .../src/main/java/org/apache/wss4j/dom/transform/STRTransform.java    | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
index 6353312c4..9145f6b03 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
@@ -48,6 +48,6 @@ public class AttachmentCiphertextTransform extends 
TransformSpi {
                                                        boolean 
secureValidation)
         throws IOException, CanonicalizationException, 
InvalidCanonicalizerException, TransformationException,
         ParserConfigurationException, SAXException {
-        return new XMLSignatureInput((byte[])null);
+        return null;
     }
 }
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
index 2289d01a7..861c44e2e 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
@@ -23,12 +23,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData;
 import org.apache.jcp.xml.dsig.internal.dom.ApacheOctetStreamData;
 import org.apache.wss4j.common.ext.Attachment;
 import org.apache.wss4j.common.util.AttachmentUtils;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.xml.security.signature.XMLSignatureInput;
 
 import javax.xml.crypto.Data;
 import javax.xml.crypto.OctetStreamData;
@@ -85,7 +83,7 @@ public class AttachmentCompleteSignatureTransform extends 
AttachmentContentSigna
                         ),
                         attachmentUri, mimeType);
             }
-            return new ApacheNodeSetData(new XMLSignatureInput((byte[])null));
+            return null;
         } catch (IOException e) {
             throw new TransformException(e);
         }
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
index 901165517..b847c0eb7 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
@@ -18,7 +18,6 @@
  */
 package org.apache.wss4j.dom.transform;
 
-import org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData;
 import org.apache.jcp.xml.dsig.internal.dom.ApacheOctetStreamData;
 import org.apache.wss4j.common.ext.Attachment;
 import org.apache.wss4j.common.ext.AttachmentRequestCallback;
@@ -237,7 +236,7 @@ public class AttachmentContentSignatureTransform extends 
TransformService {
                         ),
                         attachmentUri, mimeType);
             }
-            return new ApacheNodeSetData(new XMLSignatureInput((byte[])null));
+            return null;
         } catch (IOException | InvalidCanonicalizerException | 
CanonicalizationException
             | XMLParserException e) {
             throw new TransformException(e);
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
index 62fd550a8..4e1ecbd47 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
@@ -37,7 +37,6 @@ import javax.xml.crypto.dsig.TransformException;
 import javax.xml.crypto.dsig.TransformService;
 import javax.xml.crypto.dsig.spec.TransformParameterSpec;
 
-import org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData;
 import org.apache.wss4j.common.bsp.BSPEnforcer;
 import org.apache.wss4j.common.token.PKIPathSecurity;
 import org.apache.wss4j.common.token.SecurityTokenReference;
@@ -215,7 +214,7 @@ public class STRTransform extends TransformService {
             //
             if (os != null) {
                 canon.canonicalizeSubtree(dereferencedToken, "#default", true, 
os);
-                return new ApacheNodeSetData(new 
XMLSignatureInput((byte[])null));
+                return null;
             }
 
             try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {