[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/jce NeuClearJCETest.java,1.14,1.15

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	NeuClearJCETest.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: NeuClearJCETest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/jce/NeuClearJCETest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** NeuClearJCETest.java	18 Feb 2004 00:14:35 -0000	1.14
--- NeuClearJCETest.java	1 Apr 2004 23:19:50 -0000	1.15
***************
*** 40,43 ****
--- 40,48 ----
  $Id$
  $Log$
+ Revision 1.15  2004/04/01 23:19:50  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.14  2004/02/18 00:14:35  pelle
  Many, many clean ups. I've readded Targets in a new method.
***************
*** 132,140 ****
  
      public final void testGetCertificate() throws NeuClearException, XMLException {
!         final IdentityBuilder id = new IdentityBuilder(signer.getPublicKey("neu://bob@test"));
!         final Identity bob = (Identity) id.convert("neu://bob@test",signer);
!         final Certificate cert = bob.getCertificate();
          assertNotNull(cert);
!         assertEquals(cert.getPublicKey(), bob.getPublicKey());
      }
  
--- 137,145 ----
  
      public final void testGetCertificate() throws NeuClearException, XMLException {
!         final IdentityBuilder id = new IdentityBuilder();
!         final Identity bob = (Identity) id.convert("neu://bob@test", signer);
!         final Certificate cert = bob.getSignatory().getCertificate();
          assertNotNull(cert);
!         assertEquals(cert.getPublicKey(), bob.getSignatory().getPublicKey());
      }
  
***************
*** 147,154 ****
          final KeyPair kp = kpg.generateKeyPair();
          final JCESigner sig2 = new JCESigner(ks, new AlwaysTheSamePassphraseAgent("neuclear"));
!         final IdentityBuilder id = new IdentityBuilder( kp.getPublic());
!         final Identity eve = (Identity) id.convert("neu://test",signer);
  
!         ks.setKeyEntry("neu://eve@test", kp.getPrivate(), "neuclear".toCharArray(), eve.getCertificateChain());
          assertTrue(ks.containsAlias("neu://eve@test"));
  //        assertTrue(ks.isCertificateEntry("neu://eve@test"));
--- 152,159 ----
          final KeyPair kp = kpg.generateKeyPair();
          final JCESigner sig2 = new JCESigner(ks, new AlwaysTheSamePassphraseAgent("neuclear"));
!         final IdentityBuilder id = new IdentityBuilder();
!         final Identity eve = (Identity) id.convert("neu://test", signer);
  
!         ks.setKeyEntry("neu://eve@test", kp.getPrivate(), "neuclear".toCharArray(), eve.getSignatory().getCertificateChain());
          assertTrue(ks.containsAlias("neu://eve@test"));
  //        assertTrue(ks.isCertificateEntry("neu://eve@test"));
***************
*** 156,178 ****
          assertNotNull(ks.getCertificate("neu://eve@test"));
          assertNotNull(ks.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(eve.getCertificate(),ks.getCertificate("neu://eve@test"));
!         assertEquals(eve.getPublicKey(),ks.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(kp.getPrivate(),ks.getKey("neu://eve@test","neuclear".toCharArray()));
!         assertEquals(ks.getCertificateAlias(eve.getCertificate()),"neu://eve@test");
          try {
!             ks.getCertificate("neu://eve@test").verify(signer.getPublicKey("neu://test"));;
          } catch (InvalidKeyException e) {
!             assertTrue("Invalid Key",false);
          } catch (SignatureException e) {
!             assertTrue("Invalid Signature",false);
          }
          //Lets write it
!         File ksfile=new File("target/testdata/keystores/testneuclearcert.jks");
          ksfile.getParentFile().mkdirs();
          try {
!             ks.store(new FileOutputStream(ksfile),"neuclear".toCharArray());
          } catch (Exception e) {
              e.printStackTrace();
!             assertTrue("Couldnt write file",false);
          }
          final KeyStore ks2 = KeyStore.getInstance("jks", "SUN");
--- 161,184 ----
          assertNotNull(ks.getCertificate("neu://eve@test"));
          assertNotNull(ks.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(eve.getSignatory().getCertificate(), ks.getCertificate("neu://eve@test"));
!         assertEquals(eve.getSignatory().getPublicKey(), ks.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(kp.getPrivate(), ks.getKey("neu://eve@test", "neuclear".toCharArray()));
!         assertEquals(ks.getCertificateAlias(eve.getSignatory().getCertificate()), "neu://eve@test");
          try {
!             ks.getCertificate("neu://eve@test").verify(signer.getPublicKey("neu://test"));
!             ;
          } catch (InvalidKeyException e) {
!             assertTrue("Invalid Key", false);
          } catch (SignatureException e) {
!             assertTrue("Invalid Signature", false);
          }
          //Lets write it
!         File ksfile = new File("target/testdata/keystores/testneuclearcert.jks");
          ksfile.getParentFile().mkdirs();
          try {
!             ks.store(new FileOutputStream(ksfile), "neuclear".toCharArray());
          } catch (Exception e) {
              e.printStackTrace();
!             assertTrue("Couldnt write file", false);
          }
          final KeyStore ks2 = KeyStore.getInstance("jks", "SUN");
***************
*** 181,185 ****
          } catch (Exception e) {
              e.printStackTrace();
!             assertTrue("Couldnt Read File",false);
          }
  
--- 187,191 ----
          } catch (Exception e) {
              e.printStackTrace();
!             assertTrue("Couldnt Read File", false);
          }
  
***************
*** 189,203 ****
          assertNotNull(ks2.getCertificate("neu://eve@test"));
          assertNotNull(ks2.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(eve.getCertificate(),ks2.getCertificate("neu://eve@test"));
!         assertEquals(eve.getPublicKey(),ks2.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(kp.getPrivate(),ks2.getKey("neu://eve@test","neuclear".toCharArray()));
  
!         assertEquals(ks2.getCertificateAlias(eve.getCertificate()),"neu://eve@test");
          try {
!             ks2.getCertificate("neu://eve@test").verify(signer.getPublicKey("neu://test"));;
          } catch (InvalidKeyException e) {
!             assertTrue("Invalid Key",false);
          } catch (SignatureException e) {
!             assertTrue("Invalid Signature",false);
          }
          //final AuthenticationTicketBuilder authb = new AuthenticationTicketBuilder("neu://eve@test", "neu://test", "http://users.neuclear.org:8080");
--- 195,210 ----
          assertNotNull(ks2.getCertificate("neu://eve@test"));
          assertNotNull(ks2.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(eve.getSignatory().getCertificate(), ks2.getCertificate("neu://eve@test"));
!         assertEquals(eve.getSignatory().getPublicKey(), ks2.getCertificate("neu://eve@test").getPublicKey());
!         assertEquals(kp.getPrivate(), ks2.getKey("neu://eve@test", "neuclear".toCharArray()));
  
!         assertEquals(ks2.getCertificateAlias(eve.getSignatory().getCertificate()), "neu://eve@test");
          try {
!             ks2.getCertificate("neu://eve@test").verify(signer.getPublicKey("neu://test"));
!             ;
          } catch (InvalidKeyException e) {
!             assertTrue("Invalid Key", false);
          } catch (SignatureException e) {
!             assertTrue("Invalid Signature", false);
          }
          //final AuthenticationTicketBuilder authb = new AuthenticationTicketBuilder("neu://eve@test", "neu://test", "http://users.neuclear.org:8080");
***************
*** 205,229 ****
  
      }
      public void testCreateAndUpdateCert() throws NeuClearException, XMLException {
!         PublicKey pub=getSigner().generateKey(IVAN);
          assertNotNull(pub);
!         final IdentityBuilder id = new IdentityBuilder(pub);
          assertTrue(signer.canSignFor(IVAN));
          assertNotNull(signer.getPublicKey(IVAN));
!         assertEquals(pub,signer.getPublicKey(IVAN));
!         id.sign(IVAN,signer);
          try {
              final Identity ivan = (Identity) id.convert();
              assertNotNull(ivan);
  //            assertEquals(IVAN,ivan.getName());
!             assertNotNull(ivan.getPublicKey());
!             assertEquals(pub,ivan.getCertificate().getPublicKey());
!             assertEquals(ivan.getPublicKey(),signer.getPublicKey(IVAN));
              final byte[] data = "this is a test".getBytes();
              final byte[] sig = signer.sign(IVAN, data);
              assertNotNull(sig);
!             assertTrue(CryptoTools.verify(ivan.getPublicKey(), data, sig));
          } catch (InvalidNamedObjectException e) {
!             assertTrue("The Signature was invalid",false);
          }
      }
--- 212,237 ----
  
      }
+ 
      public void testCreateAndUpdateCert() throws NeuClearException, XMLException {
!         PublicKey pub = getSigner().generateKey(IVAN);
          assertNotNull(pub);
!         final IdentityBuilder id = new IdentityBuilder();
          assertTrue(signer.canSignFor(IVAN));
          assertNotNull(signer.getPublicKey(IVAN));
!         assertEquals(pub, signer.getPublicKey(IVAN));
!         id.sign(IVAN, signer);
          try {
              final Identity ivan = (Identity) id.convert();
              assertNotNull(ivan);
  //            assertEquals(IVAN,ivan.getName());
!             assertNotNull(ivan.getSignatory().getPublicKey());
!             assertEquals(pub, ivan.getSignatory().getCertificate().getPublicKey());
!             assertEquals(ivan.getSignatory().getPublicKey(), signer.getPublicKey(IVAN));
              final byte[] data = "this is a test".getBytes();
              final byte[] sig = signer.sign(IVAN, data);
              assertNotNull(sig);
!             assertTrue(CryptoTools.verify(ivan.getSignatory().getPublicKey(), data, sig));
          } catch (InvalidNamedObjectException e) {
!             assertTrue("The Signature was invalid", false);
          }
      }