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/06 16:51:28 UTC
svn commit: r1100243 - in
/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature:
VerifyMerlinsExamplesFifteen.java VerifyMerlinsExamplesTwentyThree.java
Author: mullan
Date: Fri May 6 14:51:28 2011
New Revision: 1100243
URL: http://svn.apache.org/viewvc?rev=1100243&view=rev
Log:
[SANTUARIO-250] - VerifyMerlinsExamplesFifteen/TwentyThree.java samples should ignore signature-enveloping-hmac-sha1-40.xml
Modified:
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java?rev=1100243&r1=1100242&r2=1100243&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesFifteen.java Fri May 6 14:51:28 2011
@@ -90,7 +90,6 @@ public class VerifyMerlinsExamplesFiftee
String merlinsDir =
"samples/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",
@@ -98,21 +97,14 @@ public class VerifyMerlinsExamplesFiftee
merlinsDir + "signature-external-b64-dsa.xml",
merlinsDir + "signature-external-dsa.xml"
};
- 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/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java?rev=1100243&r1=1100242&r2=1100243&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifyMerlinsExamplesTwentyThree.java Fri May 6 14:51:28 2011
@@ -97,7 +97,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",