[ws-wss4j] branch master updated: Picking up latest Santuario changes

[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 498bfdc  Picking up latest Santuario changes
498bfdc is described below

commit 498bfdc1de2b232ca00480cab766cf591be9c10a
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed Jan 15 17:37:24 2020 +0000

    Picking up latest Santuario changes
---
 .../wss4j/dom/resolvers/ResolverAttachment.java    |  4 ----
 .../transform/AttachmentCiphertextTransform.java   | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
index 383f714..7ebfd54 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
@@ -55,8 +55,4 @@ public class ResolverAttachment extends ResourceResolverSpi {
         return false;
     }
 
-    @Override
-    public boolean engineIsThreadSafe() {
-        return true;
-    }
 }
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 18b9601..9145f6b 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
@@ -18,11 +18,22 @@
  */
 package org.apache.wss4j.dom.transform;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.wss4j.dom.WSConstants;
+import org.apache.xml.security.c14n.CanonicalizationException;
+import org.apache.xml.security.c14n.InvalidCanonicalizerException;
+import org.apache.xml.security.signature.XMLSignatureInput;
 import org.apache.xml.security.transforms.TransformSpi;
+import org.apache.xml.security.transforms.TransformationException;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 /**
- * Fake class to be able to create a Tranforms object
+ * Fake class to be able to create a Transforms object
  */
 public class AttachmentCiphertextTransform extends TransformSpi {
 
@@ -30,4 +41,13 @@ public class AttachmentCiphertextTransform extends 
TransformSpi {
     protected String engineGetURI() {
         return WSConstants.SWA_ATTACHMENT_CIPHERTEXT_TRANS;
     }
+
+    @Override
+    protected XMLSignatureInput enginePerformTransform(XMLSignatureInput 
input, OutputStream os,
+                                                       Element 
transformElement, String baseURI,
+                                                       boolean 
secureValidation)
+        throws IOException, CanonicalizationException, 
InvalidCanonicalizerException, TransformationException,
+        ParserConfigurationException, SAXException {
+        return null;
+    }
 }