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

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

Update of /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/jce
In directory sc8-pr-cvs1:/tmp/cvs-serv455/src/test/org/neuclear/id/jce

Modified Files:
	NeuClearJCETest.java 
Log Message:
NeuClear JCE Certificates now work with KeyStore.
We can now create JCE certificates based on NeuClear Identity's and store them in a keystore.

Index: NeuClearJCETest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/jce/NeuClearJCETest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NeuClearJCETest.java	10 Dec 2003 23:58:52 -0000	1.6
--- NeuClearJCETest.java	17 Dec 2003 12:45:57 -0000	1.7
***************
*** 11,14 ****
--- 11,17 ----
  
  import java.io.IOException;
+ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.FileInputStream;
  import java.security.*;
  import java.security.cert.Certificate;
***************
*** 36,39 ****
--- 39,46 ----
  $Id$
  $Log$
+ Revision 1.7  2003/12/17 12:45:57  pelle
+ NeuClear JCE Certificates now work with KeyStore.
+ We can now create JCE certificates based on NeuClear Identity's and store them in a keystore.
+ 
  Revision 1.6  2003/12/10 23:58:52  pelle
  Did some cleaning up in the builders
***************
*** 104,111 ****
      }
  
!     public final void testStoreKey() throws NeuClearException, XMLException, NoSuchProviderException, NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException {
!         final KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC");
          final KeyStore ks = KeyStore.getInstance("jks", "SUN");
          ks.load(null, null);
          kpg.initialize(512);
          final KeyPair kp = kpg.generateKeyPair();
--- 111,119 ----
      }
  
!     public final void testStoreKey() throws NeuClearException, XMLException, NoSuchProviderException, NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException, UnrecoverableKeyException {
!         final KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
          final KeyStore ks = KeyStore.getInstance("jks", "SUN");
          ks.load(null, null);
+ 
          kpg.initialize(512);
          final KeyPair kp = kpg.generateKeyPair();
***************
*** 115,120 ****
  
          ks.setKeyEntry("neu://eve@test", kp.getPrivate(), "neuclear".toCharArray(), eve.getCertificateChain());
  
!         final AuthenticationTicketBuilder authb = new AuthenticationTicketBuilder("neu://eve@test", "neu://test", "http://users.neuclear.org:8080");
          //authb.sign(sig2);
  
--- 123,162 ----
  
          ks.setKeyEntry("neu://eve@test", kp.getPrivate(), "neuclear".toCharArray(), eve.getCertificateChain());
+         assertTrue(ks.containsAlias("neu://eve@test"));
+ //        assertTrue(ks.isCertificateEntry("neu://eve@test"));
+         assertTrue(ks.isKeyEntry("neu://eve@test"));
+         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()));
  
!         //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");
!         try {
!             ks2.load(new FileInputStream(ksfile), "neuclear".toCharArray());
!         } catch (Exception e) {
!             e.printStackTrace();
!             assertTrue("Couldnt Read File",false);
!         }
! 
!         assertTrue(ks2.containsAlias("neu://eve@test"));
! //        assertTrue(ks2.isCertificateEntry("neu://eve@test"));
!         assertTrue(ks2.isKeyEntry("neu://eve@test"));
!         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()));
! 
!         //final AuthenticationTicketBuilder authb = new AuthenticationTicketBuilder("neu://eve@test", "neu://test", "http://users.neuclear.org:8080");
          //authb.sign(sig2);