[Neuclear-develop] neuclear-id/src/test/org/neuclear/id IdentityTests.java,1.6,1.7

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

Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19634/src/test/org/neuclear/id

Modified Files:
	IdentityTests.java 
Log Message:
The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.

Index: IdentityTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IdentityTests.java	8 Mar 2004 23:51:11 -0000	1.6
--- IdentityTests.java	20 Mar 2004 17:19:55 -0000	1.7
***************
*** 12,15 ****
--- 12,16 ----
  import org.neuclear.id.verifier.VerifyingReader;
  import org.neuclear.tests.AbstractObjectCreationTest;
+ import org.neuclear.xml.xmlsec.EnvelopedSignature;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
  import org.neuclear.xml.xmlsec.XMLSignature;
***************
*** 53,58 ****
--- 54,64 ----
  
      public void testAnonymous() throws NoSuchAlgorithmException {
+         <<<<<<< IdentityTests.java
+         KeyPair kp = CryptoTools.createTinyDSAKeyPair();
+         Identity id = new Identity(kp.getPublic());
+         =======
          KeyPair kp = CryptoTools.createTinyRSAKeyPair();
          Identity id = new Identity(kp.getPublic());
+         >>>>>>> 1.6
          assertNotNull(id);
          assertNotNull(id.getName());
***************
*** 63,71 ****
      }
  
      public void testEmbedded() throws NoSuchAlgorithmException, XMLSecurityException, CryptoException, NameResolutionException, InvalidNamedObjectException {
!         KeyPair kp = CryptoTools.createTinyRSAKeyPair();
          Document doc = DocumentHelper.createDocument();
          Element elem = doc.addElement("TestElement");
!         XMLSignature sig = new XMLSignature(kp, elem);
          assertEquals(kp.getPublic(), sig.getSignersKey());
          SignedNamedObject obj = VerifyingReader.getInstance().read(elem);
--- 69,78 ----
      }
  
+     <<<<<<< IdentityTests.java
      public void testEmbedded() throws NoSuchAlgorithmException, XMLSecurityException, CryptoException, NameResolutionException, InvalidNamedObjectException {
!         KeyPair kp = CryptoTools.createTinyDSAKeyPair();
          Document doc = DocumentHelper.createDocument();
          Element elem = doc.addElement("TestElement");
!         XMLSignature sig = new EnvelopedSignature(kp, elem);
          assertEquals(kp.getPublic(), sig.getSignersKey());
          SignedNamedObject obj = VerifyingReader.getInstance().read(elem);
***************
*** 74,87 ****
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(5, 37));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32));
  
  
!         Identity id = obj.getSignatory();
!         assertNotNull(id);
!         assertNotNull(id.getName());
!         assertEquals("sha1:", id.getName().substring(0, 5));
!         assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName().substring(5));
!         assertEquals(kp.getPublic(), id.getPublicKey());
  
  
      }
- }
--- 81,109 ----
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(5, 37));
          assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32));
+         =======
+         public void testEmbedded
+         () throws NoSuchAlgorithmException, XMLSecurityException, CryptoException, NameResolutionException, InvalidNamedObjectException
+         {
+             KeyPair kp = CryptoTools.createTinyRSAKeyPair();
+             Document doc = DocumentHelper.createDocument();
+             Element elem = doc.addElement("TestElement");
+             XMLSignature sig = new XMLSignature(kp, elem);
+             assertEquals(kp.getPublic(), sig.getSignersKey());
+             SignedNamedObject obj = VerifyingReader.getInstance().read(elem);
+             System.out.println("Name: " + obj.getName());
+             assertEquals("sha1:", obj.getName().substring(0, 5));
+             assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), obj.getName().substring(5, 37));
+             assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(obj.getEncoded().getBytes())), obj.getName().substring(obj.getName().length() - 32));
+             >>>>>>> 1.6
  
  
!             Identity id = obj.getSignatory();
!             assertNotNull(id);
!             assertNotNull(id.getName());
!             assertEquals("sha1:", id.getName().substring(0, 5));
!             assertEquals(CryptoTools.encodeBase32(CryptoTools.digest(kp.getPublic().getEncoded())), id.getName().substring(5));
!             assertEquals(kp.getPublic(), id.getPublicKey());
  
  
+         }
      }