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 2015/12/15 18:13:22 UTC
svn commit: r1720201 [17/24] - in /santuario/xml-security-java/trunk:
samples/javax/xml/crypto/dsig/samples/
samples/org/apache/xml/security/samples/
samples/org/apache/xml/security/samples/algorithms/
samples/org/apache/xml/security/samples/canonicali...
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java Tue Dec 15 17:13:17 2015
@@ -41,7 +41,7 @@ public class XMLSecurityEventReaderTest
@Test
public void testConformness() throws Exception {
XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
- XMLStreamReader xmlStreamReader =
+ XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml"));
@@ -55,7 +55,7 @@ public class XMLSecurityEventReaderTest
XMLSecurityEventReader xmlSecurityEventReader = new XMLSecurityEventReader(xmlSecEventDeque, 0);
- XMLEventReader xmlEventReader =
+ XMLEventReader xmlEventReader =
xmlInputFactory.createXMLEventReader(this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml"));
while (xmlEventReader.hasNext()) {
@@ -80,7 +80,7 @@ public class XMLSecurityEventReaderTest
@Test
public void testIndex() throws Exception {
XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
- XMLStreamReader xmlStreamReader =
+ XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml"));
@@ -96,7 +96,7 @@ public class XMLSecurityEventReaderTest
XMLSecurityEventReader xmlSecurityEventReader = new XMLSecurityEventReader(xmlSecEventDeque, skip);
- XMLEventReader xmlEventReader =
+ XMLEventReader xmlEventReader =
xmlInputFactory.createXMLEventReader(this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml"));
int currentIndex = 0;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java Tue Dec 15 17:13:17 2015
@@ -111,7 +111,7 @@ public class XMLSecurityStreamReaderTest
XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
- XMLStreamReader stdXmlStreamReader =
+ XMLStreamReader stdXmlStreamReader =
xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml"));
@@ -249,7 +249,7 @@ public class XMLSecurityStreamReaderTest
}
private String readTestFile() throws Exception {
- InputStream inputStream =
+ InputStream inputStream =
this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml");
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
@@ -270,7 +270,7 @@ public class XMLSecurityStreamReaderTest
XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
- xmlStreamReader =
+ xmlStreamReader =
xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream(
"org/apache/xml/security/c14n/inExcl/plain-soap-1.1.xml"));
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java Tue Dec 15 17:13:17 2015
@@ -63,10 +63,10 @@ public class Canonicalizer11Test extends
@Test
public void test31withCommentsSubtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_c14n-comments.xml");
@@ -81,10 +81,10 @@ public class Canonicalizer11Test extends
@Test
public void test31subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_c14n.xml");
@@ -99,10 +99,10 @@ public class Canonicalizer11Test extends
@Test
public void test32subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/32_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/32_c14n.xml");
@@ -117,10 +117,10 @@ public class Canonicalizer11Test extends
@Test
public void test33subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/33_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/33_c14n.xml");
@@ -135,10 +135,10 @@ public class Canonicalizer11Test extends
@Test
public void test34() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_c14n.xml");
@@ -161,10 +161,10 @@ public class Canonicalizer11Test extends
@Test
public void test34subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_input_validatingParser.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_c14n_validatingParser.xml");
@@ -179,10 +179,10 @@ public class Canonicalizer11Test extends
@Test
public void test35subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/35_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/35_c14n.xml");
@@ -197,10 +197,10 @@ public class Canonicalizer11Test extends
@Test
public void test36subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/36_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/36_c14n.xml");
@@ -240,7 +240,7 @@ public class Canonicalizer11Test extends
xmlSecEvent = (XMLSecEvent) xmlSecEventReader.nextEvent();
}
- byte[] reference =
+ byte[] reference =
getBytesFromResource(this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/38_c14n.xml"));
boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
@@ -316,7 +316,7 @@ public class Canonicalizer11Test extends
@Test
public void testRelativeNSbehaviour() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/relative-ns-behaviour.xml");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java Tue Dec 15 17:13:17 2015
@@ -87,7 +87,7 @@ public class Canonicalizer20010315Exclus
xmlSecEvent = (XMLSecEvent) xmlSecEventReader.nextEvent();
}
- byte[] reference =
+ byte[] reference =
getBytesFromResource(this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/inExcl/example2_2_c14nized_exclusive.xml"));
boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
@@ -114,7 +114,7 @@ public class Canonicalizer20010315Exclus
new QName("http://example.net", "elem2")
);
- byte[] reference =
+ byte[] reference =
getBytesFromResource(this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/inExcl/example2_2_c14nized_exclusive.xml"));
boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
@@ -141,7 +141,7 @@ public class Canonicalizer20010315Exclus
new QName("http://example.net", "elem2")
);
- byte[] reference =
+ byte[] reference =
getBytesFromResource(this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/inExcl/example2_4_c14nized.xml"));
boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
@@ -168,7 +168,7 @@ public class Canonicalizer20010315Exclus
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body", "env")
);
- byte[] reference =
+ byte[] reference =
getBytesFromResource(this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/inExcl/plain-soap-c14nized.xml"));
boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
@@ -228,7 +228,7 @@ public class Canonicalizer20010315Exclus
}
/**
- * Method test24Aexcl - a testcase for SANTUARIO-263
+ * Method test24Aexcl - a testcase for SANTUARIO-263
* "Canonicalizer can't handle dynamical created DOM correctly"
* https://issues.apache.org/jira/browse/SANTUARIO-263
*/
@@ -243,16 +243,16 @@ public class Canonicalizer20010315Exclus
test.appendChild(elem2);
local.appendChild(test);
doc.appendChild(local);
-
+
TransformerFactory tf = TransformerFactory.newInstance();
Transformer t = tf.newTransformer();
StringWriter stringWriter = new StringWriter();
StreamResult streamResult = new StreamResult(stringWriter);
t.transform(new DOMSource(doc), streamResult);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
List<String> inclusiveNamespaces = new ArrayList<String>();
- Canonicalizer20010315_ExclWithCommentsTransformer c =
+ Canonicalizer20010315_ExclWithCommentsTransformer c =
new Canonicalizer20010315_ExclWithCommentsTransformer();
Map<String, Object> transformerProperties = new HashMap<String, Object>();
transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java Tue Dec 15 17:13:17 2015
@@ -127,7 +127,7 @@ public class Canonicalizer20010315Test e
xmlSecEvent = (XMLSecEvent) xmlSecEventReader.nextEvent();
}
- byte[] reference =
+ byte[] reference =
getBytesFromResource(this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/inExcl/example2_2_2_c14nized.xml"));
boolean equals = java.security.MessageDigest.isEqual(reference, baos.toByteArray());
@@ -147,10 +147,10 @@ public class Canonicalizer20010315Test e
@Test
public void test31withCommentsSubtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_c14n-comments.xml");
@@ -165,10 +165,10 @@ public class Canonicalizer20010315Test e
@Test
public void test31subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/31_c14n.xml");
@@ -183,10 +183,10 @@ public class Canonicalizer20010315Test e
@Test
public void test32subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/32_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/32_c14n.xml");
@@ -201,10 +201,10 @@ public class Canonicalizer20010315Test e
@Test
public void test33subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/33_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/33_c14n.xml");
@@ -219,10 +219,10 @@ public class Canonicalizer20010315Test e
@Test
public void test34() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_c14n.xml");
@@ -244,10 +244,10 @@ public class Canonicalizer20010315Test e
*/
@Test
public void test34subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_input_validatingParser.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/34_c14n_validatingParser.xml");
@@ -262,10 +262,10 @@ public class Canonicalizer20010315Test e
@Test
public void test35subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/35_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/35_c14n.xml");
@@ -280,10 +280,10 @@ public class Canonicalizer20010315Test e
@Test
public void test36subtree() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/36_input.xml");
- URL fileRef =
+ URL fileRef =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/36_c14n.xml");
@@ -352,7 +352,7 @@ public class Canonicalizer20010315Test e
@Test
public void testRelativeNSbehaviour() throws Exception {
- URL fileIn =
+ URL fileIn =
this.getClass().getClassLoader().getResource(
"org/apache/xml/security/c14n/in/relative-ns-behaviour.xml");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java Tue Dec 15 17:13:17 2015
@@ -52,51 +52,51 @@ import org.w3c.dom.Document;
* Interop test for exclusive canonical XML.
*/
public class ExclusiveC14NInteropTest extends org.junit.Assert {
-
+
// Define the Keys
- private static final String DSA_Y =
+ private static final String DSA_Y =
"100608549353392247642909699559958629799239376887928526645894830026725196161145566849708733883990135426653044817911443739078414918200719335778010681793609319420004405842110519195451832486531732453606134760724262533773278050009694686068237740978670601469803011818937563585466331102373332041567195551433843399821";
private static final String DSA_P =
"168777965834506183316029234822049448824510746356579047085445137260615952005547237578049190106944051176874334502490044372001095187406578652983566270415497585188065671106321782044399345015635174214653019063633432488260846312454028091420079382316827654485991763360842518637782234847501432479186061030043532804049";
- private static final String DSA_Q =
+ private static final String DSA_Q =
"869728719104136791953389816626377255923310715629";
- private static final String DSA_G =
+ private static final String DSA_G =
"92540127839696181660603196559927599444985269069164107041817893521317620801749269178254275499516782269048036232822187472000302495112526925817061777055402839811893512245205312429410597288465276425092799962454093795367121466944495977844096953319768287183660390415542263887700389610463126158583843139357076400271";
-
+
private XMLInputFactory xmlInputFactory;
private TransformerFactory transformerFactory = TransformerFactory.newInstance();
-
+
@Before
public void setUp() throws Exception {
Init.init(ExclusiveC14NInteropTest.class.getClassLoader().getResource("security-config.xml").toURI(),
this.getClass());
org.apache.xml.security.Init.init();
-
+
xmlInputFactory = XMLInputFactory.newInstance();
xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
}
-
+
@Test
public void test_Y1() throws Exception {
// Read in plaintext document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream("interop/c14n/Y1/exc-signature.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
Key publicKey = getPublicKey();
-
+
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Verify signature
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDisableSchemaValidation(true);
@@ -106,13 +106,13 @@ public class ExclusiveC14NInteropTest ex
StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
-
- private static PublicKey getPublicKey()
+
+ private static PublicKey getPublicKey()
throws InvalidKeySpecException, NoSuchAlgorithmException {
KeyFactory kf = KeyFactory.getInstance("DSA");
- KeySpec kspec = new DSAPublicKeySpec(new BigInteger(DSA_Y),
- new BigInteger(DSA_P),
- new BigInteger(DSA_Q),
+ KeySpec kspec = new DSAPublicKeySpec(new BigInteger(DSA_Y),
+ new BigInteger(DSA_P),
+ new BigInteger(DSA_Q),
new BigInteger(DSA_G));
return kf.generatePublic(kspec);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Tue Dec 15 17:13:17 2015
@@ -57,19 +57,19 @@ import org.w3c.dom.Node;
/**
* Interop test for XML Encryption
- *
+ *
* @author $Author: coheigea $
* @version $Revision: 1236690 $ $Date: 2012-01-27 14:07:10 +0000 (Fri, 27 Jan 2012) $
*/
public class BaltimoreEncTest extends org.junit.Assert {
-
+
private static String cardNumber;
private static int nodeCount = 0;
private static PrivateKey rsaKey;
private XMLInputFactory xmlInputFactory;
private TransformerFactory transformerFactory = TransformerFactory.newInstance();
-
+
@Before
public void setUp() throws Exception {
org.apache.xml.security.Init.init();
@@ -77,7 +77,7 @@ public class BaltimoreEncTest extends or
xmlInputFactory = XMLInputFactory.newInstance();
xmlInputFactory.setEventAllocator(new XMLSecEventAllocator());
- String filename =
+ String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml";
String basedir = System.getProperty("basedir");
if (basedir != null && !"".equals(basedir)) {
@@ -89,10 +89,10 @@ public class BaltimoreEncTest extends or
Document doc = db.parse(new java.io.FileInputStream(f));
cardNumber = retrieveCCNumber(doc);
-
+
// Count the nodes in the document as a secondary test
nodeCount = countNodes(doc);
-
+
// rsaKey
filename = "src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/rsa.p8";
if (basedir != null && !"".equals(basedir)) {
@@ -102,7 +102,7 @@ public class BaltimoreEncTest extends or
byte[] pkcs8Bytes = JavaUtils.getBytesFromFile(filename);
PKCS8EncodedKeySpec pkcs8Spec = new PKCS8EncodedKeySpec(pkcs8Bytes);
- // Create a key factory
+ // Create a key factory
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
rsaKey = keyFactory.generatePrivate(pkcs8Spec);
}
@@ -110,302 +110,302 @@ public class BaltimoreEncTest extends or
@Test
public void test_five_content_3des_cbc() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-tripledes-cbc.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "DESede");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
-
+
@Test
public void test_five_content_aes256_cbc() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes256-cbc-prop.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "AES");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
-
+
@Test
public void test_five_content_aes128_cbc_kw_aes192() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-content-aes128-cbc-kw-aes192.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "AES");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
-
+
@Test
public void test_five_content_3des_cbc_kw_aes128() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-tripledes-cbc-kw-aes128.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "AES");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
-
+
@Test
public void test_five_content_aes128_cbc_rsa_15() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-element-aes128-cbc-rsa-1_5.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(rsaKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
checkDecryptedDoc(document, true);
}
-
+
@Test
public void test_five_data_aes128_cbc() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes128-cbc.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnop".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "AES");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
-
+
@Test
public void test_five_data_aes256_cbc_3des() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes256-cbc-kw-tripledes.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwx".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "DESede");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
-
+
@Test
public void test_five_data_aes192_cbc_aes256() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-aes192-cbc-kw-aes256.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// Set up the Key
byte[] keyBytes = "abcdefghijklmnopqrstuvwxyz012345".getBytes("ASCII");
SecretKey secretKey = new SecretKeySpec(keyBytes, "AES");
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(secretKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
-
+
@Test
public void test_five_data_3des_cbc_rsa_oaep() throws Exception {
// Read in document
- InputStream sourceDocument =
+ InputStream sourceDocument =
this.getClass().getClassLoader().getResourceAsStream(
"ie/baltimore/merlin-examples/merlin-xmlenc-five/encrypt-data-tripledes-cbc-rsa-oaep-mgf1p.xml");
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
-
+
// XMLUtils.outputDOM(document, System.out);
-
+
// Convert Document to a Stream Reader
javax.xml.transform.Transformer transformer = transformerFactory.newTransformer();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
transformer.transform(new DOMSource(document), new StreamResult(baos));
- final XMLStreamReader xmlStreamReader =
+ final XMLStreamReader xmlStreamReader =
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray()));
-
+
// Decrypt
XMLSecurityProperties properties = new XMLSecurityProperties();
properties.setDecryptionKey(rsaKey);
InboundXMLSec inboundXMLSec = XMLSec.getInboundWSSec(properties);
TestSecurityEventListener securityEventListener = new TestSecurityEventListener();
- XMLStreamReader securityStreamReader =
+ XMLStreamReader securityStreamReader =
inboundXMLSec.processInMessage(xmlStreamReader, null, securityEventListener);
-
+
document = StAX2DOM.readDoc(XMLUtils.createDocumentBuilder(false), securityStreamReader);
}
-
+
/*
* Check we have retrieved a Credit Card number and that it is OK
* Check that the document has the correct number of nodes
@@ -420,12 +420,12 @@ public class BaltimoreEncTest extends or
int myNodeCount = countNodes(d);
assertTrue(
- "Node count mismatches",
+ "Node count mismatches",
((myNodeCount > 0) && myNodeCount == nodeCount)
);
}
}
-
+
/**
* Method retrieveCCNumber
*
@@ -433,12 +433,12 @@ public class BaltimoreEncTest extends or
*
* @param doc The document to retrieve the card number from
* @return The retrieved credit card number
- * @throws XPathExpressionException
+ * @throws XPathExpressionException
*/
- private static String retrieveCCNumber(Document doc)
- throws javax.xml.transform.TransformerException,
+ private static String retrieveCCNumber(Document doc)
+ throws javax.xml.transform.TransformerException,
XPathExpressionException {
-
+
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
Map<String, String> namespace = new HashMap<String, String>();
@@ -447,7 +447,7 @@ public class BaltimoreEncTest extends or
xpath.setNamespaceContext(context);
String expression = "//*[local-name()='Number']";
- Node ccnumElt =
+ Node ccnumElt =
(Node) xpath.evaluate(expression, doc, XPathConstants.NODE);
if (ccnumElt != null) {
@@ -456,7 +456,7 @@ public class BaltimoreEncTest extends or
return null;
}
-
+
/**
* Method countNodes
*
@@ -480,5 +480,5 @@ public class BaltimoreEncTest extends or
return count;
}
-
+
}