[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/verifier VerifyingReader.java,1.9,1.10

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier
In directory sc8-pr-cvs1:/tmp/cvs-serv12836/src/java/org/neuclear/id/verifier

Modified Files:
	VerifyingReader.java 
Log Message:
Signers now can generatekeys via the generateKey() method.
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
Updated all major interfaces that used the old model to use the new model.

Index: VerifyingReader.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/VerifyingReader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VerifyingReader.java	18 Nov 2003 00:01:55 -0000	1.9
--- VerifyingReader.java	19 Nov 2003 23:33:59 -0000	1.10
***************
*** 6,10 ****
  import org.neuclear.auth.AuthenticationTicket;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.*;
--- 6,9 ----
***************
*** 39,42 ****
--- 38,50 ----
  $Id$
  $Log$
+ Revision 1.10  2003/11/19 23:33:59  pelle
+ Signers now can generatekeys via the generateKey() method.
+ Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+ SignedNamedObject now contains the full xml which is returned with getEncoded()
+ This means that it is now possible to further send on or process a SignedNamedObject, leaving
+ NamedObjectBuilder for its original purposes of purely generating new Contracts.
+ NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+ Updated all major interfaces that used the old model to use the new model.
+ 
  Revision 1.9  2003/11/18 00:01:55  pelle
  The sample signing web application for logging in and out is now working.
***************
*** 120,127 ****
          Identity signatory = NSResolver.resolveIdentity(signatoryName);
          if (XMLSecTools.verifySignature(elem, signatory.getPublicKey())) {
-             //I should be able to get this from within. This is just a quick hack.
-             String digest = new String(CryptoTools.digest(XMLSecTools.canonicalize(elem)));
              Timestamp timestamp = TimeTools.parseTimeStamp(elem.attributeValue("timestamp"));
!             return resolveReader(elem).read(elem, name, signatory, digest, timestamp);
          } else
              throw new InvalidNamedObject(name + " isnt valid");
--- 128,133 ----
          Identity signatory = NSResolver.resolveIdentity(signatoryName);
          if (XMLSecTools.verifySignature(elem, signatory.getPublicKey())) {
              Timestamp timestamp = TimeTools.parseTimeStamp(elem.attributeValue("timestamp"));
!             return resolveReader(elem).read(elem, name, signatory, new String(XMLSecTools.canonicalize(elem)), timestamp);
          } else
              throw new InvalidNamedObject(name + " isnt valid");