You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2018/08/31 16:28:44 UTC
svn commit: r1839768 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/c14n/
main/java/org/apache/xml/security/encryption/
main/java/org/apache/xml/security/keys/keyresolver/ ...
Author: coheigea
Date: Fri Aug 31 16:28:43 2018
New Revision: 1839768
URL: http://svn.apache.org/viewvc?rev=1839768&view=rev
Log:
Removing validate option from XMLUtils, which we don't use anyway
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureValidator.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Fri Aug 31 16:28:43 2018
@@ -267,7 +267,7 @@ public final class DOMRetrievalMethod ex
boolean secVal = Utils.secureValidation(context);
ApacheData data = (ApacheData)dereference(context);
try (InputStream is = new ByteArrayInputStream(data.getXMLSignatureInput().getBytes())) {
- Document doc = XMLUtils.read(is, false, secVal);
+ Document doc = XMLUtils.read(is, secVal);
Element kiElem = doc.getDocumentElement();
if (kiElem.getLocalName().equals("X509Data")
&& XMLSignature.XMLNS.equals(kiElem.getNamespaceURI())) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java Fri Aug 31 16:28:43 2018
@@ -254,16 +254,7 @@ public class Canonicalizer {
try (InputStream bais = new ByteArrayInputStream(inputBytes)) {
InputSource in = new InputSource(bais);
- // needs to validate for ID attribute normalization
-
/*
- * for some of the test vectors from the specification,
- * there has to be a validating parser for ID attributes, default
- * attribute values, NMTOKENS, etc.
- * Unfortunately, the test vectors do use different DTDs or
- * even no DTD. So Xerces 1.3.1 fires many warnings about using
- * ErrorHandlers.
- *
* Text from the spec:
*
* The input octet stream MUST contain a well-formed XML document,
@@ -277,8 +268,7 @@ public class Canonicalizer {
* though the document type declaration is not retained in the
* canonical form.
*/
- document = XMLUtils.read(in, true, secureValidation,
- new org.apache.xml.security.utils.IgnoreAllErrorHandler());
+ document = XMLUtils.read(in, secureValidation);
}
return this.canonicalizeSubtree(document);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java Fri Aug 31 16:28:43 2018
@@ -57,7 +57,7 @@ public abstract class CanonicalizerSpi {
try (java.io.InputStream bais = new ByteArrayInputStream(inputBytes)) {
InputSource in = new InputSource(bais);
- document = XMLUtils.read(in, false, secureValidation);
+ document = XMLUtils.read(in, secureValidation);
}
return this.engineCanonicalizeSubTree(document);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java Fri Aug 31 16:28:43 2018
@@ -70,7 +70,7 @@ public class DocumentSerializer extends
*/
private Node deserialize(Node ctx, InputSource inputSource) throws XMLEncryptionException {
try {
- Document d = XMLUtils.read(inputSource, false, secureValidation);
+ Document d = XMLUtils.read(inputSource, secureValidation);
Document contextDocument = null;
if (Node.DOCUMENT_NODE == ctx.getNodeType()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java Fri Aug 31 16:28:43 2018
@@ -271,7 +271,7 @@ public abstract class KeyResolverSpi {
*/
protected static Element getDocFromBytes(byte[] bytes, boolean secureValidation) throws KeyResolverException {
try (InputStream is = new ByteArrayInputStream(bytes)) {
- Document doc = XMLUtils.read(is, false, secureValidation);
+ Document doc = XMLUtils.read(is, secureValidation);
return doc.getDocumentElement();
} catch (SAXException ex) {
throw new KeyResolverException(ex);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/SignedInfo.java Fri Aug 31 16:28:43 2018
@@ -212,7 +212,7 @@ public class SignedInfo extends Manifest
byte[] c14nizedBytes = c14nizer.canonicalizeSubtree(element);
try (InputStream is = new ByteArrayInputStream(c14nizedBytes)) {
- Document newdoc = XMLUtils.read(is, false, secureValidation);
+ Document newdoc = XMLUtils.read(is, secureValidation);
Node imported = element.getOwnerDocument().importNode(
newdoc.getDocumentElement(), true);
element.getParentNode().replaceChild(imported, element);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Fri Aug 31 16:28:43 2018
@@ -571,8 +571,7 @@ public class XMLSignatureInput {
ParserConfigurationException, IOException, SAXException {
// select all nodes, also the comments.
try {
- Document doc = XMLUtils.read(this.getOctetStream(), false, secureValidation,
- new org.apache.xml.security.utils.IgnoreAllErrorHandler());
+ Document doc = XMLUtils.read(this.getOctetStream(), secureValidation);
this.subNode = doc;
} catch (SAXException ex) {
byte[] result = null;
@@ -586,8 +585,7 @@ public class XMLSignatureInput {
result = baos.toByteArray();
}
try (InputStream is = new ByteArrayInputStream(result)) {
- Document document = XMLUtils.read(is, false, secureValidation,
- new org.apache.xml.security.utils.IgnoreAllErrorHandler());
+ Document document = XMLUtils.read(is, secureValidation);
this.subNode = document.getDocumentElement().getFirstChild().getFirstChild();
}
} finally {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java Fri Aug 31 16:28:43 2018
@@ -143,7 +143,7 @@ public class TransformBase64Decode exten
//Exceptional case there is current not text case testing this(Before it was a
//a common case).
Document doc =
- XMLUtils.read(input.getOctetStream(), false, secureValidation);
+ XMLUtils.read(input.getOctetStream(), secureValidation);
Element rootNode = doc.getDocumentElement();
StringBuilder sb = new StringBuilder();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Fri Aug 31 16:28:43 2018
@@ -65,12 +65,10 @@ public final class XMLUtils {
(PrivilegedAction<Boolean>) () -> Boolean.getBoolean("org.apache.xml.security.ignoreLineBreaks"));
@SuppressWarnings("unchecked")
- private static final WeakObjectPool<DocumentBuilder, ParserConfigurationException> pools[] = new WeakObjectPool[4];
+ private static final WeakObjectPool<DocumentBuilder, ParserConfigurationException> pools[] = new WeakObjectPool[2];
static {
- pools[0] = new DocumentBuilderPool(false, false);
- pools[1] = new DocumentBuilderPool(false, true);
- pools[2] = new DocumentBuilderPool(true, false);
- pools[3] = new DocumentBuilderPool(true, true);
+ pools[0] = new DocumentBuilderPool(false);
+ pools[1] = new DocumentBuilderPool(true);
}
private static volatile String dsPrefix = "ds";
@@ -1011,79 +1009,47 @@ public final class XMLUtils {
}
public static Document newDocument() throws ParserConfigurationException {
- DocumentBuilder documentBuilder = createDocumentBuilder(false);
+ DocumentBuilder documentBuilder = createDocumentBuilder(true);
Document doc = documentBuilder.newDocument();
repoolDocumentBuilder(documentBuilder);
return doc;
}
- public static Document read(InputStream inputStream, boolean validating) throws ParserConfigurationException, SAXException, IOException {
- return read(inputStream, validating, true);
+ public static Document read(InputStream inputStream) throws ParserConfigurationException, SAXException, IOException {
+ return read(inputStream, true);
}
- public static Document read(InputStream inputStream, boolean validating, boolean disAllowDocTypeDeclarations) throws ParserConfigurationException, SAXException, IOException {
- return read(inputStream, validating, disAllowDocTypeDeclarations, null);
- }
-
- public static Document read(InputStream inputStream, boolean validating, boolean disAllowDocTypeDeclarations, ErrorHandler errorHandler)
- throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilder documentBuilder = createDocumentBuilder(validating, disAllowDocTypeDeclarations);
- if (errorHandler != null) {
- documentBuilder.setErrorHandler(errorHandler);
- }
+ public static Document read(InputStream inputStream, boolean disAllowDocTypeDeclarations) throws ParserConfigurationException, SAXException, IOException {
+ DocumentBuilder documentBuilder = createDocumentBuilder(disAllowDocTypeDeclarations);
Document doc = documentBuilder.parse(inputStream);
- if (errorHandler != null) {
- documentBuilder.setErrorHandler(null);
- }
repoolDocumentBuilder(documentBuilder);
return doc;
}
- public static Document read(String uri, boolean validating, boolean disAllowDocTypeDeclarations, ErrorHandler errorHandler)
+ public static Document read(String uri, boolean disAllowDocTypeDeclarations)
throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilder documentBuilder = createDocumentBuilder(validating, disAllowDocTypeDeclarations);
- if (errorHandler != null) {
- documentBuilder.setErrorHandler(errorHandler);
- }
+ DocumentBuilder documentBuilder = createDocumentBuilder(disAllowDocTypeDeclarations);
Document doc = documentBuilder.parse(uri);
- if (errorHandler != null) {
- documentBuilder.setErrorHandler(null);
- }
repoolDocumentBuilder(documentBuilder);
return doc;
}
- public static Document read(InputSource inputSource, boolean validating) throws ParserConfigurationException, SAXException, IOException {
- return read(inputSource, validating, true, null);
+ public static Document read(InputSource inputSource) throws ParserConfigurationException, SAXException, IOException {
+ return read(inputSource, true);
}
- public static Document read(InputSource inputSource, boolean validating, boolean disAllowDocTypeDeclarations)
+ public static Document read(InputSource inputSource, boolean disAllowDocTypeDeclarations)
throws ParserConfigurationException, SAXException, IOException {
- return read(inputSource, validating, disAllowDocTypeDeclarations, null);
- }
-
- public static Document read(InputSource inputSource, boolean validating, boolean disAllowDocTypeDeclarations, ErrorHandler errorHandler)
- throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilder documentBuilder = createDocumentBuilder(validating, disAllowDocTypeDeclarations);
- if (errorHandler != null) {
- documentBuilder.setErrorHandler(errorHandler);
- }
+ DocumentBuilder documentBuilder = createDocumentBuilder(disAllowDocTypeDeclarations);
Document doc = documentBuilder.parse(inputSource);
- if (errorHandler != null) {
- documentBuilder.setErrorHandler(null);
- }
repoolDocumentBuilder(documentBuilder);
return doc;
}
- private static DocumentBuilder createDocumentBuilder(boolean validating) throws ParserConfigurationException {
- return createDocumentBuilder(validating, true);
- }
-
private static DocumentBuilder createDocumentBuilder(
- boolean validating, boolean disAllowDocTypeDeclarations
+ boolean disAllowDocTypeDeclarations
) throws ParserConfigurationException {
- int idx = getPoolsIndex(validating, disAllowDocTypeDeclarations);
+ int idx = getPoolsIndex(disAllowDocTypeDeclarations);
return pools[idx].getObject();
}
@@ -1095,7 +1061,7 @@ public final class XMLUtils {
db.reset();
boolean disAllowDocTypeDeclarations =
((DocumentBuilderProxy)db).disAllowDocTypeDeclarations();
- int idx = getPoolsIndex(db.isValidating(), disAllowDocTypeDeclarations);
+ int idx = getPoolsIndex(disAllowDocTypeDeclarations);
return pools[idx].repool(db);
}
@@ -1231,10 +1197,9 @@ public final class XMLUtils {
private static final class DocumentBuilderPool
extends WeakObjectPool<DocumentBuilder, ParserConfigurationException> {
- private final boolean validating, disAllowDocTypeDeclarations;
+ private final boolean disAllowDocTypeDeclarations;
- public DocumentBuilderPool(boolean validating, boolean disAllowDocTypeDeclarations) {
- this.validating = validating;
+ public DocumentBuilderPool(boolean disAllowDocTypeDeclarations) {
this.disAllowDocTypeDeclarations = disAllowDocTypeDeclarations;
}
@@ -1245,20 +1210,18 @@ public final class XMLUtils {
if (disAllowDocTypeDeclarations) {
dfactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
}
- dfactory.setValidating(validating);
dfactory.setNamespaceAware(true);
return new DocumentBuilderProxy(dfactory.newDocumentBuilder(), disAllowDocTypeDeclarations);
}
}
/**
- * Maps the two boolean configuration options for the factories to the array index for the WeakObjectPool
- * @param validating
+ * Maps the boolean configuration options for the factories to the array index for the WeakObjectPool
* @param disAllowDocTypeDeclarations
* @return the index to the {@link #pools}
*/
- private static int getPoolsIndex(boolean validating, boolean disAllowDocTypeDeclarations) {
- return (validating ? 2 : 0) + (disAllowDocTypeDeclarations ? 1 : 0);
+ private static int getPoolsIndex(boolean disAllowDocTypeDeclarations) {
+ return (disAllowDocTypeDeclarations ? 1 : 0);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRWrappingAttackTest.java Fri Aug 31 16:28:43 2018
@@ -58,7 +58,7 @@ public class JSRWrappingAttackTest {
public void testWrappingAttack() throws Exception {
String file = "manifestSignatureWrapping.xml";
- Document doc = XMLUtils.read(new FileInputStream(new File(dir, file)), false, false);
+ Document doc = XMLUtils.read(new FileInputStream(new File(dir, file)), false);
Element sigElement = SignatureValidator.getSignatureElement(doc);
if (sigElement == null) {
throw new Exception("Couldn't find signature Element");
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureValidator.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureValidator.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureValidator.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureValidator.java Fri Aug 31 16:28:43 2018
@@ -52,7 +52,7 @@ public class SignatureValidator {
public DOMValidateContext getValidateContext(String fn, KeySelector ks)
throws Exception {
- Document doc = XMLUtils.read(new FileInputStream(new File(dir, fn)), false, false);
+ Document doc = XMLUtils.read(new FileInputStream(new File(dir, fn)), false);
Element sigElement = getSignatureElement(doc);
if (sigElement == null) {
throw new Exception("Couldn't find signature Element");
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/TestUtils.java Fri Aug 31 16:28:43 2018
@@ -233,7 +233,7 @@ public class TestUtils {
String tag)
throws Exception {
if (type.equalsIgnoreCase("dom")) {
- Document doc = XMLUtils.read(new FileInputStream(input), false, false);
+ Document doc = XMLUtils.read(new FileInputStream(input), false);
if (tag == null) {
return new DOMValidateContext
(TestUtils.getPublicKey("RSA", 512),
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureFactoryTest.java Fri Aug 31 16:28:43 2018
@@ -158,7 +158,7 @@ public class XMLSignatureFactoryTest {
File dir = new File(base + fs +
"src/test/resources" + fs + "ie" + fs + "baltimore" + fs + "merlin-examples",
"merlin-xmldsig-twenty-three");
- Document doc = XMLUtils.read(new FileInputStream(new File(dir, "signature.xml")), false, false);
+ Document doc = XMLUtils.read(new FileInputStream(new File(dir, "signature.xml")), false);
NodeList nl = doc.getElementsByTagName("KeyInfo");
try {
stuff = factory.unmarshalXMLSignature
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Fri Aug 31 16:28:43 2018
@@ -32,7 +32,6 @@ import javax.xml.xpath.XPathFactory;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.test.dom.DSNamespaceContext;
-import org.apache.xml.security.utils.IgnoreAllErrorHandler;
import org.apache.xml.security.utils.JavaUtils;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -74,11 +73,10 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/31_c14n-comments.xml";
String fileOut = prefix + "out/xpath_31_output-comments.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -93,11 +91,10 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/32_c14n.xml";
String fileOut = prefix + "out/xpath_32_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -112,11 +109,10 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/33_c14n.xml";
String fileOut = prefix + "out/xpath_33_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null; // Canonicalizer.XPATH_C14N_OMIT_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -133,11 +129,10 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/34_c14n.xml";
String fileOut = prefix + "out/xpath_34_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = false;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -152,11 +147,10 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/35_c14n.xml";
String fileOut = prefix + "out/xpath_35_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -171,11 +165,10 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/36_c14n.xml";
String fileOut = prefix + "out/xpath_36_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -190,7 +183,6 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/37_c14n.xml";
String fileOut = prefix + "out/xpath_37_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = true;
Map<String, String> namespace = new HashMap<>();
namespace.put("ietf", "http://www.ietf.org");
@@ -203,7 +195,7 @@ public class Canonicalizer11Test {
+ "]";
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath, namespace));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath, namespace));
}
/**
@@ -216,7 +208,6 @@ public class Canonicalizer11Test {
String fileRef = prefix + "in/38_c14n.xml";
String fileOut = prefix + "out/xpath_38_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
- boolean validating = true;
Map<String, String> namespace = new HashMap<>();
namespace.put("ietf", "http://www.ietf.org");
@@ -229,7 +220,7 @@ public class Canonicalizer11Test {
+ "]";
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath, namespace));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath, namespace));
}
private boolean c14nAndCompare(
@@ -237,12 +228,11 @@ public class Canonicalizer11Test {
String fileRef,
String fileOut,
String c14nURI,
- boolean validating,
String xpath
) throws Exception {
Map<String, String> namespace = new HashMap<>();
return c14nAndCompare(fileIn, fileRef, fileOut,
- c14nURI, validating, xpath, namespace);
+ c14nURI, xpath, namespace);
}
private boolean c14nAndCompare(
@@ -250,12 +240,11 @@ public class Canonicalizer11Test {
String fileRef,
String fileOut,
String c14nURI,
- boolean validating,
String xpath,
Map<String, String> namespaces
) throws Exception {
- Document doc = XMLUtils.read(fileIn, validating, false, new IgnoreAllErrorHandler());
+ Document doc = XMLUtils.read(fileIn, false);
Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
byte c14nBytes[] = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Fri Aug 31 16:28:43 2018
@@ -42,7 +42,6 @@ import javax.xml.xpath.XPathFactory;
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.test.dom.DSNamespaceContext;
-import org.apache.xml.security.utils.IgnoreAllErrorHandler;
import org.apache.xml.security.utils.JavaUtils;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
@@ -86,11 +85,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/31_c14n-comments.xml";
String fileOut = prefix + "out/xpath_31_output-comments.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -105,11 +103,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/31_c14n-comments.xml";
String fileOut = prefix + "out/xpath_31_output-comments.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -125,11 +122,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/31_c14n.xml";
String fileOut = prefix + "out/xpath_31_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -146,11 +142,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/31_c14n.xml";
String fileOut = prefix + "out/xpath_31_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -165,11 +160,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/32_c14n.xml";
String fileOut = prefix + "out/xpath_32_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -184,11 +178,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/32_c14n.xml";
String fileOut = prefix + "out/xpath_32_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -203,11 +196,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/33_c14n.xml";
String fileOut = prefix + "out/xpath_33_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null; // Canonicalizer.XPATH_C14N_OMIT_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
@org.junit.Test
@@ -217,11 +209,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/33_c14n.xml";
String fileOut = prefix + "out/xpath_33_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -238,11 +229,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/34_c14n.xml";
String fileOut = prefix + "out/xpath_34_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = false;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -266,11 +256,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/34_c14n_validatingParser.xml";
String fileOut = prefix + "out/xpath_34_output_validatingParser.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -295,11 +284,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/34_c14n_validatingParser.xml";
String fileOut = prefix + "out/xpath_34_output_validatingParser.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -314,11 +302,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/35_c14n.xml";
String fileOut = prefix + "out/xpath_35_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -333,11 +320,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/35_c14n.xml";
String fileOut = prefix + "out/xpath_35_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -352,11 +338,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/36_c14n.xml";
String fileOut = prefix + "out/xpath_36_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = null;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -371,11 +356,10 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/36_c14n.xml";
String fileOut = prefix + "out/xpath_36_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
String xpath = Canonicalizer.XPATH_C14N_WITH_COMMENTS_SINGLE_NODE;
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath));
}
/**
@@ -390,7 +374,6 @@ public class Canonicalizer20010315Test {
String fileRef = prefix + "in/37_c14n.xml";
String fileOut = prefix + "out/xpath_37_output.xml";
String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- boolean validating = true;
Map<String, String> namespace = new HashMap<>();
namespace.put("ietf", "http://www.ietf.org");
@@ -403,7 +386,7 @@ public class Canonicalizer20010315Test {
+ "]";
assertTrue(descri,
- c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, validating, xpath, namespace));
+ c14nAndCompare(fileIn, fileRef, fileOut, c14nURI, xpath, namespace));
}
/**
@@ -418,9 +401,8 @@ public class Canonicalizer20010315Test {
String fileIn = prefix + "in/37_input.xml";
String fileRef = prefix + "in/37_c14n.xml";
//String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- //boolean validating = true;
- Document doc = XMLUtils.read(new FileInputStream(fileIn), false, false);
+ Document doc = XMLUtils.read(new FileInputStream(fileIn), false);
String xpath = "(//. | //@* | //namespace::*)"
+ "[ "
@@ -685,7 +667,7 @@ public class Canonicalizer20010315Test {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
- doc = XMLUtils.read(is, true, true, new IgnoreAllErrorHandler());
+ doc = XMLUtils.read(is, true);
}
Canonicalizer c14nizer =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
@@ -712,12 +694,11 @@ public class Canonicalizer20010315Test {
String fileRef,
String fileOut,
String c14nURI,
- boolean validating,
String xpath
) throws Exception {
Map<String, String> namespace = new HashMap<>();
return c14nAndCompare(fileIn, fileRef, fileOut,
- c14nURI, validating, xpath, namespace);
+ c14nURI, xpath, namespace);
}
private boolean c14nAndCompare(
@@ -725,12 +706,11 @@ public class Canonicalizer20010315Test {
String fileRef,
String fileOut,
String c14nURI,
- boolean validating,
String xpath,
Map<String, String> namespaces
) throws Exception {
- Document doc = XMLUtils.read(fileIn, validating, false, new IgnoreAllErrorHandler());
+ Document doc = XMLUtils.read(fileIn, false);
Canonicalizer c14n = Canonicalizer.getInstance(c14nURI);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java Fri Aug 31 16:28:43 2018
@@ -119,7 +119,7 @@ public class ExclusiveC14NInteropTest ex
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java Fri Aug 31 16:28:43 2018
@@ -80,7 +80,7 @@ public class Santuario273Test {
public void testC14n11Base() throws Exception {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
- doc = XMLUtils.read(is, true, false, new org.apache.xml.security.utils.IgnoreAllErrorHandler());
+ doc = XMLUtils.read(is, false);
}
Canonicalizer c14n =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java Fri Aug 31 16:28:43 2018
@@ -61,7 +61,7 @@ public class InteropTestBase {
String filename, ResourceResolverSpi resolver, boolean followManifests, byte[] hmacKey
) throws Exception {
File f = new File(filename);
- org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
@@ -92,7 +92,7 @@ public class InteropTestBase {
boolean followManifests, boolean secureValidation)
throws Exception {
File f = new File(filename);
- org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java Fri Aug 31 16:28:43 2018
@@ -74,7 +74,7 @@ public class ForbiddenAlgorithmTest exte
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java Fri Aug 31 16:28:43 2018
@@ -77,7 +77,7 @@ public class WrappingAttackTest extends
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
@@ -96,7 +96,7 @@ public class WrappingAttackTest extends
File f = new File(directory + "/" + file);
- org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false, false);
+ org.w3c.dom.Document doc = XMLUtils.read(new FileInputStream(f), false);
Element sigElement =
(Element) doc.getElementsByTagNameNS(Constants.SignatureSpecNS,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/SignatureReferenceTest.java Fri Aug 31 16:28:43 2018
@@ -148,7 +148,7 @@ public class SignatureReferenceTest {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/coreFeatures/signatures/manifestSignature.xml");
- Document document = XMLUtils.read(sourceDocument, false, false);
+ Document document = XMLUtils.read(sourceDocument, false);
String expression = "//dsig:Signature[1]";
Element sigElement =
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java?rev=1839768&r1=1839767&r2=1839768&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java Fri Aug 31 16:28:43 2018
@@ -112,7 +112,7 @@ public class TransformBase64DecodeTest {
Document doc = null;
try (InputStream is = new ByteArrayInputStream(input.getBytes())) {
- doc = XMLUtils.read(is, false, false, new org.apache.xml.security.utils.IgnoreAllErrorHandler());
+ doc = XMLUtils.read(is, false);
}
//XMLUtils.circumventBug2650(doc);