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/29 13:48:42 UTC
svn commit: r1839577 [4/6] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/utils/
test/java/javax/xml/crypto/test/dsig/
test/java/javax/xml/crypto/test/dsig/keyinfo/
test/java/org/apache/xml/security/test/dom/ test/java/o...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java Wed Aug 29 13:48:41 2018
@@ -146,7 +146,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -214,7 +214,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -282,7 +282,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -348,7 +348,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -413,7 +413,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -478,7 +478,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -543,7 +543,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -613,7 +613,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -683,7 +683,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -753,7 +753,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -823,7 +823,7 @@ public class KeyWrapEncryptionCreationTe
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java Wed Aug 29 13:48:41 2018
@@ -32,7 +32,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;
@@ -114,8 +113,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -158,7 +156,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -171,8 +169,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -215,7 +212,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -228,8 +225,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -272,7 +268,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -285,8 +281,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -330,7 +325,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -343,8 +338,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -387,7 +381,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -400,8 +394,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -444,7 +437,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -457,8 +450,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -501,7 +493,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -516,8 +508,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -563,7 +554,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -578,8 +569,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -625,7 +615,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -640,8 +630,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -687,7 +676,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -702,8 +691,7 @@ public class KeyWrapEncryptionVerificati
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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
@@ -749,7 +737,7 @@ public class KeyWrapEncryptionVerificati
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java Wed Aug 29 13:48:41 2018
@@ -131,7 +131,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -192,7 +192,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -253,7 +253,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -314,7 +314,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -375,7 +375,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -436,7 +436,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -496,7 +496,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -559,7 +559,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -621,7 +621,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -683,7 +683,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
@@ -745,7 +745,7 @@ public class SymmetricEncryptionCreation
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java Wed Aug 29 13:48:41 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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -150,7 +148,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -163,8 +161,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -203,7 +200,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -216,8 +213,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -256,7 +252,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -269,8 +265,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -309,7 +304,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -322,8 +317,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -362,7 +356,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -375,8 +369,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("AES");
@@ -415,7 +408,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -428,8 +421,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
@@ -467,7 +459,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -482,8 +474,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("SEED");
@@ -522,7 +513,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -537,8 +528,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -577,7 +567,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -592,8 +582,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -632,7 +621,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
@@ -647,8 +636,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.read(sourceDocument, false);
// Set up the Key
KeyGenerator keygen = KeyGenerator.getInstance("Camellia");
@@ -687,7 +675,7 @@ public class SymmetricEncryptionVerifica
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Wed Aug 29 13:48:41 2018
@@ -36,7 +36,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;
@@ -88,8 +87,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.read(this.getClass().getClassLoader().getResourceAsStream(filename), false);
cardNumber = retrieveCCNumber(doc);
nodeCount = countNodes(doc);
@@ -423,8 +421,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.read(this.getClass().getClassLoader().getResourceAsStream(filename), false);
return decryptElement(doc, rsaKey);
}
@@ -456,7 +453,7 @@ public class XMLEncryption11Test extends
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- return StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ return StAX2DOM.readDoc(securityStreamReader);
}
/**
@@ -529,7 +526,7 @@ public class XMLEncryption11Test extends
Document document = null;
try (InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
- document = XMLUtils.createDocumentBuilder(false).parse(is);
+ document = XMLUtils.read(is, false);
}
NodeList nodeList = document.getElementsByTagNameNS("urn:example:po", "PaymentInfo");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java Wed Aug 29 13:48:41 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;
@@ -224,8 +223,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.read(new FileInputStream(file), false);
XMLSignature sig = new XMLSignature(document, "", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
Element root = document.getDocumentElement();
@@ -244,8 +242,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.read(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);
@@ -286,8 +283,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.read(new FileInputStream(file), false);
XMLCipher cipher = XMLCipher.getInstance("http://www.w3.org/2001/04/xmlenc#aes256-cbc");
cipher.init(XMLCipher.ENCRYPT_MODE, encryptionSymKey);
@@ -298,8 +294,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.read(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/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Wed Aug 29 13:48:41 2018
@@ -38,7 +38,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;
@@ -125,8 +124,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.read(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -152,7 +150,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -165,8 +163,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.read(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -191,7 +188,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -206,8 +203,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -228,7 +224,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -241,8 +237,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -263,7 +258,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -276,8 +271,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -298,7 +292,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -311,8 +305,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -333,7 +326,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 15),
@@ -358,8 +351,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -384,7 +376,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -414,8 +406,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 15);
@@ -440,7 +431,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 15),
@@ -457,8 +448,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.read(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -484,7 +474,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ document = StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key,
@@ -497,8 +487,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.read(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -523,7 +512,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -538,8 +527,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -564,7 +552,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -577,8 +565,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -603,7 +590,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -616,8 +603,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -638,7 +624,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA", 23),
@@ -651,8 +637,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -673,7 +658,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -699,8 +684,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -725,7 +709,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -755,8 +739,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("DSA", 23);
@@ -781,7 +764,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA", 23),
@@ -811,8 +794,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.read(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -842,7 +824,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -872,8 +854,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.read(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -901,7 +882,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -927,8 +908,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -947,7 +927,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -973,8 +953,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -993,7 +972,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1019,8 +998,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1050,7 +1028,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1080,8 +1058,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1109,7 +1086,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1135,8 +1112,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1166,7 +1142,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1183,8 +1159,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1203,7 +1178,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
}
@Test
@@ -1224,8 +1199,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.read(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1255,7 +1229,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1285,8 +1259,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.read(sourceDocument, false);
// Set up the Key
CertificateFactory cf = CertificateFactory.getInstance("X509");
@@ -1314,7 +1287,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1340,8 +1313,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1360,7 +1332,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1386,8 +1358,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1406,7 +1377,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1432,8 +1403,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1463,7 +1433,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
@@ -1493,8 +1463,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1522,7 +1491,7 @@ public class BaltimoreTest extends Asser
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1548,8 +1517,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -1579,7 +1547,7 @@ public class BaltimoreTest extends Asser
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1839577&r1=1839576&r2=1839577&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Wed Aug 29 13:48:41 2018
@@ -34,7 +34,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;
@@ -108,8 +107,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.read(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -135,7 +133,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, key, SecurityTokenConstants.KeyIdentifier_NoKeyInfo);
@@ -147,8 +145,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.read(sourceDocument, false);
// Set up the Key
byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
@@ -170,7 +167,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader = inboundXMLSec.processInMessage(xmlStreamReader);
try {
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
fail("Failure expected on a short HMAC length");
} catch (XMLStreamException ex) {
Assert.assertTrue(ex.getCause() instanceof XMLSecurityException);
@@ -184,8 +181,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -206,7 +202,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("DSA"),
@@ -219,8 +215,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.read(sourceDocument, false);
// XMLUtils.outputDOM(document, System.out);
@@ -241,7 +236,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),
@@ -272,7 +267,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -306,7 +301,7 @@ public class IAIKTest extends Assert {
try {
TestUtils.switchAllowNotSameDocumentReferences(true);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
}
@@ -322,8 +317,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.read(sourceDocument, false);
// Set up the Key
Key publicKey = getPublicKey("RSA");
@@ -348,7 +342,7 @@ public class IAIKTest extends Assert {
XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
- StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
+ StAX2DOM.readDoc(securityStreamReader);
// Check the SecurityEvents
checkSignatureToken(securityEventListener, getPublicKey("RSA"),