|
From: <pe...@us...> - 2004-03-02 23:42:50
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32469/src/java/org/neuclear/xml Modified Files: AbstractElementProxy.java Log Message: Renamed SignatureInfo to SignedInfo as that is the name of the Element. Made some changes in the Canonicalizer to make all the output verify in Aleksey's xmlsec library. Unfortunately this breaks example 3 of merlin-eight's canonicalization interop tests, because dom4j afaik can't tell the difference between <test/> and <test xmlns=""/>. Changed XMLSignature it is now has less repeated code. Index: AbstractElementProxy.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/AbstractElementProxy.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** AbstractElementProxy.java 19 Feb 2004 00:27:59 -0000 1.10 --- AbstractElementProxy.java 2 Mar 2004 23:30:43 -0000 1.11 *************** *** 2,5 **** --- 2,12 ---- * $Id$ * $Log$ + * Revision 1.11 2004/03/02 23:30:43 pelle + * Renamed SignatureInfo to SignedInfo as that is the name of the Element. + * Made some changes in the Canonicalizer to make all the output verify in Aleksey's xmlsec library. + * Unfortunately this breaks example 3 of merlin-eight's canonicalization interop tests, because dom4j afaik + * can't tell the difference between <test/> and <test xmlns=""/>. + * Changed XMLSignature it is now has less repeated code. + * * Revision 1.10 2004/02/19 00:27:59 pelle * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working. *************** *** 105,109 **** * * Revision 1.3 2002/10/10 21:29:31 pelle ! * Oops. XML-Signature's SignedInfo element I had coded as SignatureInfo * As I thought Canonicalisation doesnt seem to be standard. * Updated the SignedServlet to default to using ~/.neuclear/signers.ks --- 112,116 ---- * * Revision 1.3 2002/10/10 21:29:31 pelle ! * Oops. XML-Signature's SignedInfo element I had coded as SignedInfo * As I thought Canonicalisation doesnt seem to be standard. * Updated the SignedServlet to default to using ~/.neuclear/signers.ks *************** *** 191,194 **** --- 198,202 ---- return element; } + /** * Adds another Element with the given name and the same Namespace as this element to this element. *************** *** 196,201 **** * @param child */ ! protected final Element addElement(final String child,final String text) { ! Element elem=addElement(child); elem.addText(text); return elem; --- 204,209 ---- * @param child */ ! protected final Element addElement(final String child, final String text) { ! Element elem = addElement(child); elem.addText(text); return elem; |