|
From: <pe...@us...> - 2004-02-19 00:38:03
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19678/src/test/org/neuclear/xml/xmlsec Modified Files: RefTest.java SignatureTests.java SimpleXMLSigTest.java Log Message: Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working. Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers. Index: RefTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/RefTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RefTest.java 15 Jan 2004 00:01:46 -0000 1.4 --- RefTest.java 19 Feb 2004 00:28:00 -0000 1.5 *************** *** 32,35 **** --- 32,39 ---- $Id$ $Log$ + Revision 1.5 2004/02/19 00:28:00 pelle + Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working. + Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers. + Revision 1.4 2004/01/15 00:01:46 pelle Problem fixed with Enveloping signatures. *************** *** 68,76 **** public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException { ! Document doc=DocumentHelper.parseText("<test Id=\"one\">hello</test>"); Reference ref=new Reference(doc.getRootElement(),Reference.XMLSIGTYPE_ENVELOPED); assertNotNull(ref); // assertNotNull(ref.getDigest()); ! assertEquals("#one",ref.getUri()); System.out.println(ref.asXML()); --- 72,81 ---- public void testEnvelopedReference() throws DocumentException, XMLException, CryptoException { ! Document doc=DocumentHelper.parseText("<test>hello</test>"); Reference ref=new Reference(doc.getRootElement(),Reference.XMLSIGTYPE_ENVELOPED); assertNotNull(ref); // assertNotNull(ref.getDigest()); ! assertEquals("",ref.getUri()); ! // assertEquals(ref.); System.out.println(ref.asXML()); *************** *** 78,82 **** public void testEnvelopingReference() throws DocumentException, XMLException, CryptoException, InvalidSignatureException { Document doc=DocumentHelper.parseText("<Signature><SignedInfo/><Object Id=\"one\"><test>hello</test></Object></Signature>"); ! Reference ref=new Reference(doc.getRootElement().element("Object"),Reference.XMLSIGTYPE_ENVELOPED); doc.getRootElement().element("SignedInfo").add(ref.getElement()); assertNotNull(XMLTools.getByID(doc,"one")); --- 83,87 ---- public void testEnvelopingReference() throws DocumentException, XMLException, CryptoException, InvalidSignatureException { Document doc=DocumentHelper.parseText("<Signature><SignedInfo/><Object Id=\"one\"><test>hello</test></Object></Signature>"); ! Reference ref=new Reference(doc.getRootElement().element("Object"),Reference.XMLSIGTYPE_ENVELOPING); doc.getRootElement().element("SignedInfo").add(ref.getElement()); assertNotNull(XMLTools.getByID(doc,"one")); Index: SignatureTests.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SignatureTests.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SignatureTests.java 14 Jan 2004 17:07:59 -0000 1.4 --- SignatureTests.java 19 Feb 2004 00:28:00 -0000 1.5 *************** *** 7,10 **** --- 7,14 ---- * $Id$ * $Log$ + * Revision 1.5 2004/02/19 00:28:00 pelle + * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working. + * Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers. + * * Revision 1.4 2004/01/14 17:07:59 pelle * KeyInfo containing X509Certificates now work correctly. *************** *** 89,97 **** import org.dom4j.DocumentException; import org.dom4j.io.SAXReader; - import org.neuclear.xml.xmlsec.XMLSecTools; - import org.neuclear.commons.RegexFileNameFilter; import org.neuclear.commons.NeuClearException; ! import java.io.*; public final class SignatureTests extends TestCase { --- 93,103 ---- import org.dom4j.DocumentException; import org.dom4j.io.SAXReader; import org.neuclear.commons.NeuClearException; + import org.neuclear.commons.RegexFileNameFilter; ! import java.io.File; ! import java.io.FileNotFoundException; ! import java.io.FilenameFilter; ! import java.io.IOException; public final class SignatureTests extends TestCase { *************** *** 152,156 **** } catch (Exception e) { System.out.println("ERROR: "+(errors++)+e.getMessage()); ! e.printStackTrace(); //To change body of catch statement use Options | File Templates. } } --- 158,162 ---- } catch (Exception e) { System.out.println("ERROR: "+(errors++)+e.getMessage()); ! // e.printStackTrace(); //To change body of catch statement use Options | File Templates. } } Index: SimpleXMLSigTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SimpleXMLSigTest.java 14 Jan 2004 06:42:38 -0000 1.7 --- SimpleXMLSigTest.java 19 Feb 2004 00:28:00 -0000 1.8 *************** *** 22,25 **** --- 22,29 ---- * $Id$ * $Log$ + * Revision 1.8 2004/02/19 00:28:00 pelle + * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working. + * Currently there is still a problem with enveloping signatures and it seems enveloped signatures done via signers. + * * Revision 1.7 2004/01/14 06:42:38 pelle * Got rid of the verifyXXX() methods *************** *** 157,183 **** } - public final void testQuickRSASignXML() throws DocumentException, XMLException, CryptoException { - Document doc = DocumentHelper.parseText(TESTXML); - XMLSecTools.signElement( doc.getRootElement(), signer); - final File outputFile = new File("target/testdata/homegrown/signature-enveloped-rsa-quick.xml"); - XMLTools.writeFile(outputFile, doc); - - doc = XMLTools.loadDocument(outputFile); - assertTrue("Test if RSA Signature is valid", XMLSecTools.verifySignature(doc.getRootElement())); - } - - public final void testQuickDSASignXML() - throws DocumentException, XMLException, CryptoException { - assertTrue("Test if public key is really DSA", dsaSigner.getPublic() instanceof DSAPublicKey); - Document doc = DocumentHelper.parseText(TESTXML); - XMLSecTools.signElement( doc.getRootElement(), dsaSigner); - - final File outputFile = new File("target/testdata/homegrown/signature-enveloped-dsa-quick.xml"); - XMLTools.writeFile(outputFile, doc); - - doc = XMLTools.loadDocument(outputFile); - assertTrue("Test if DSA Signature is valid", XMLSecTools.verifySignature(doc.getRootElement())); - } - public final void testBadSignXML() throws DocumentException, XMLException, CryptoException { --- 161,164 ---- |