You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2011/05/05 19:58:43 UTC
svn commit: r1099898 - in
/santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature:
VerifyMerlinsExamplesFifteen.java VerifyMerlinsExamplesTwentyThree.java
Author: mullan
Date: Thu May 5 17:58:43 2011
New Revision: 1099898
URL: http://svn.apache.org/viewvc?rev=1099898&view=rev
Log:
[SANTUARIO-250] - VerifyMerlinsExamplesFifteen/TwentyThree.java samples should ignore signature-enveloping-hmac-sha1-40.xml
Modified:
santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
Modified: santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java?rev=1099898&r1=1099897&r2=1099898&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java (original)
+++ santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java Thu May 5 17:58:43 2011
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2011 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -87,7 +87,6 @@ public class VerifyMerlinsExamplesFiftee
String merlinsDir =
"data/ie/baltimore/merlin-examples/merlin-xmldsig-fifteen/";
String filenames[] = { merlinsDir + "signature-enveloping-hmac-sha1.xml",
- merlinsDir + "signature-enveloping-hmac-sha1-40.xml",
merlinsDir + "signature-enveloped-dsa.xml",
merlinsDir + "signature-enveloping-b64-dsa.xml",
merlinsDir + "signature-enveloping-dsa.xml",
@@ -95,22 +94,14 @@ public class VerifyMerlinsExamplesFiftee
merlinsDir + "signature-external-b64-dsa.xml",
merlinsDir + "signature-external-dsa.xml"
};
- //J+
- int start = 0;
- // int end = filenames.length;
- int end = 2;
- for (int i = start; i < 2; i++) {
- String signatureFileName = filenames[i];
-
- try {
- verifyHMAC(dbf, signatureFileName);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ verifyHMAC(dbf, filenames[0]);
+ } catch (Exception ex) {
+ ex.printStackTrace();
}
- for (int i = 2; i < filenames.length; i++) {
+ for (int i = 1; i < filenames.length; i++) {
String signatureFileName = filenames[i];
try {
Modified: santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java?rev=1099898&r1=1099897&r2=1099898&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java (original)
+++ santuario/xml-security-java/branches/1.4.x-fixes/src_samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java Thu May 5 17:58:43 2011
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2011 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,7 +95,6 @@ public class VerifyMerlinsExamplesTwenty
merlinsDir + "signature-enveloped-dsa.xml",
merlinsDir + "signature-enveloping-b64-dsa.xml",
merlinsDir + "signature-enveloping-dsa.xml",
- merlinsDir + "signature-enveloping-hmac-sha1-40.xml",
merlinsDir + "signature-enveloping-hmac-sha1.xml",
merlinsDir + "signature-enveloping-rsa.xml",
merlinsDir + "signature-external-b64-dsa.xml",