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/06/06 08:24:44 UTC
svn commit: r1832986 [5/7] - in
/santuario/xml-security-java/branches/2.0.x-fixes: ./
src/main/java/org/apache/jcp/xml/dsig/internal/dom/
src/main/java/org/apache/xml/security/
src/main/java/org/apache/xml/security/c14n/
src/main/java/org/apache/xml/se...
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java Wed Jun 6 08:24:42 2018
@@ -31,7 +31,6 @@ import java.util.List;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -110,8 +109,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -147,7 +145,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -160,8 +158,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -197,7 +194,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -210,8 +207,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -247,7 +243,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -260,8 +256,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -297,7 +292,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -310,8 +305,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -347,7 +341,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -360,8 +354,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -397,7 +390,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -410,8 +403,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -446,7 +438,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -462,8 +454,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
@@ -499,7 +490,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -515,8 +506,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -552,7 +542,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -568,8 +558,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -605,7 +594,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -621,8 +610,7 @@ public class SymmetricEncryptionVerifica
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -658,7 +646,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Wed Jun 6 08:24:42 2018
@@ -38,7 +38,6 @@ import javax.crypto.BadPaddingException;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -112,8 +111,7 @@ public class XMLEncryption11Test extends
xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
String filename = "org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(this.getClass().getClassLoader().getResourceAsStream(filename));
+ Document doc = XMLUtils.parse(this.getClass().getClassLoader().getResourceAsStream(filename), false);
cardNumber = retrieveCCNumber(doc);
nodeCount = countNodes(doc);
@@ -452,8 +450,7 @@ public class XMLEncryption11Test extends
* decrypt it and return the resulting document
*/
private Document decryptElement(String filename, Key rsaKey) throws Exception {
- DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
- Document doc = db.parse(this.getClass().getClassLoader().getResourceAsStream(filename));
+ Document doc = XMLUtils.parse(this.getClass().getClassLoader().getResourceAsStream(filename), false);
return decryptElement(doc, rsaKey);
}
@@ -485,7 +482,7 @@ public class XMLEncryption11Test extends
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- return StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ return StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
/**
@@ -556,8 +553,7 @@ public class XMLEncryption11Test extends
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Assert.assertEquals(nodeList.getLength(), 0);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java Wed Jun 6 08:24:42 2018
@@ -33,7 +33,6 @@ import org.w3c.dom.Element;
import javax.crypto.KeyGenerator;
import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
@@ -225,8 +224,7 @@ public abstract class AbstractPerformanc
protected void doDOMSignatureOutbound(File file, int tagCount) throws Exception {
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(file);
+ Document document = XMLUtils.parse(new FileInputStream(file), false);
XMLSignature sig = new XMLSignature(document, "", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
Element root = document.getDocumentElement();
@@ -245,8 +243,7 @@ public abstract class AbstractPerformanc
protected void doDOMSignatureInbound(File file, int tagCount) throws Exception {
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(file);
+ Document document = XMLUtils.parse(new FileInputStream(file), false);
Element signatureElement = (Element) document.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#", "Signature").item(0);
((Element) signatureElement.getParentNode()).setIdAttributeNS(null, "Id", true);
@@ -287,8 +284,7 @@ public abstract class AbstractPerformanc
protected void doDOMEncryptionOutbound(File file, int tagCount) throws Exception {
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(file);
+ Document document = XMLUtils.parse(new FileInputStream(file), false);
XMLCipher cipher = XMLCipher.getInstance("http://www.w3.org/2001/04/xmlenc#aes256-cbc");
cipher.init(XMLCipher.ENCRYPT_MODE, encryptionSymKey);
@@ -299,8 +295,7 @@ public abstract class AbstractPerformanc
protected void doDOMDecryptionInbound(File file, int tagCount) throws Exception {
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(file);
+ Document document = XMLUtils.parse(new FileInputStream(file), false);
XMLCipher cipher = XMLCipher.getInstance("http://www.w3.org/2001/04/xmlenc#aes256-cbc");
cipher.init(XMLCipher.DECRYPT_MODE, encryptionSymKey);
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Wed Jun 6 08:24:42 2018
@@ -37,7 +37,6 @@ import java.security.spec.RSAPublicKeySp
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -124,8 +123,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-hmac-sha1.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -148,7 +146,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -161,8 +159,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-hmac-sha1-40.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -184,7 +181,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -199,8 +196,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloped-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -218,7 +214,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -231,8 +227,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -250,7 +245,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -263,8 +258,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -282,7 +276,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -295,8 +289,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-enveloping-rsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -314,7 +307,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 15),
@@ -339,8 +332,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-external-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -362,7 +354,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -392,8 +384,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/signature-external-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -415,7 +406,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -432,8 +423,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -456,7 +446,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -469,8 +459,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -492,7 +481,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -507,8 +496,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloped-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -530,7 +518,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -543,8 +531,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -566,7 +553,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -579,8 +566,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -598,7 +584,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -611,8 +597,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-rsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -630,7 +615,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -656,8 +641,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-external-b64-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -679,7 +663,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -709,8 +693,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-external-dsa.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -732,7 +715,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -762,8 +745,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-keyname.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -790,7 +772,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -820,8 +802,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -846,7 +827,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -872,8 +853,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-crt-crl.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -889,7 +869,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -915,8 +895,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -932,7 +911,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -958,8 +937,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-is.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -986,7 +964,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1016,8 +994,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-ski.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1042,7 +1019,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1068,8 +1045,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-x509-sn.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1096,7 +1072,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1113,8 +1089,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-exc-c14n-one/exc-signature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1130,7 +1105,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
}
@Test
@@ -1151,8 +1126,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-keyname.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1179,7 +1153,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1209,8 +1183,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-retrievalmethod-rawx509crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1235,7 +1208,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1261,8 +1234,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-crt-crl.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1278,7 +1250,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1304,8 +1276,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-crt.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1321,7 +1292,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1347,8 +1318,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-is.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1375,7 +1345,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1405,8 +1375,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-ski.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1431,7 +1400,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1457,8 +1426,7 @@ public class BaltimoreTest extends Asser
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmldsig-eighteen/signature-x509-sn.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1485,7 +1453,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Wed Jun 6 08:24:42 2018
@@ -33,7 +33,6 @@ import java.security.spec.RSAPublicKeySp
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -107,8 +106,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/hMACSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -131,7 +129,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key, SecurityTokenConstants.KeyIdentifier_NoKeyInfo);
@@ -143,8 +141,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/hMACShortSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes("ASCII");
@@ -166,7 +163,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -180,8 +177,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/dSASignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -199,7 +195,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA"),
@@ -212,8 +208,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/signatureAlgorithms/signatures/rSASignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -231,7 +226,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
@@ -262,7 +257,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -296,7 +291,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -312,8 +307,7 @@ public class IAIKTest extends Assert {
InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"at/iaik/ixsil/transforms/signatures/envelopedSignatureSignature.xml");
- DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
- Document document = builder.parse(sourceDocument);
+ Document document = XMLUtils.parse(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("RSA");
@@ -335,7 +329,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(XMLUtils.newDocument(false), securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java?rev=1832986&r1=1832985&r2=1832986&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java Wed Jun 6 08:24:42 2018
@@ -119,9 +119,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -160,9 +159,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -201,9 +199,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -242,9 +239,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -286,9 +282,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -330,9 +325,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -374,9 +368,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -418,9 +411,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -462,9 +454,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -506,9 +497,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, rsaKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -547,9 +537,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -588,9 +577,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -629,9 +617,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -670,9 +657,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -711,9 +697,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, ecKeyPair.getPublic(), properties.getSignatureSecureParts());
@@ -755,9 +740,8 @@ public class PKSignatureCreationTest ext
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
xmlStreamWriter.close();
- // System.out.println("Got:\n" + new String(baos.toByteArray(), "UTF-8"));
- Document document =
- XMLUtils.createDocumentBuilder(false).parse(new ByteArrayInputStream(baos.toByteArray()));
+ // System.out.println("Got:\n" + new String(baos.toByteArray(), StandardCharsets.UTF_8.name()));
+ Document document = XMLUtils.parse(new ByteArrayInputStream(baos.toByteArray()), false);
// Verify using DOM
verifyUsingDOM(document, ecKeyPair.getPublic(), properties.getSignatureSecureParts());