[Neuclear-develop] neuclear-id/src/java/org/neuclear/id Identity.java,1.24,1.25

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

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

Modified Files:
	Identity.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: Identity.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/Identity.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Identity.java	16 Dec 2003 15:05:00 -0000	1.24
--- Identity.java	17 Dec 2003 12:45:57 -0000	1.25
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.25  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.24  2003/12/16 15:05:00  pelle
   * Added SignedMessage contract for signing simple textual contracts.
***************
*** 373,377 ****
  
      public final java.security.cert.Certificate getCertificate() {
!         return new NeuClearCertificate();
      }
  
--- 377,381 ----
  
      public final java.security.cert.Certificate getCertificate() {
!         return new NeuClearCertificate(this);
      }
  
***************
*** 398,417 ****
  
      public final java.security.cert.Certificate[] getCertificateChain() {
!         final ArrayList certs = new ArrayList(3);
!         Identity id = this;
!         while (id != null) {
!             certs.add(id.getCertificate());
!             id = id.getSignatory();
!         }
!         certs.add(NEUROOT.getCertificate());
!         certs.trimToSize();
!         final Certificate[] cert = new Certificate[certs.size()];
!         final Iterator iter = certs.iterator();
!         int i = 0;
!         while (iter.hasNext()) {
!             final Certificate certificate = (java.security.cert.Certificate) iter.next();
!             cert[i++] = certificate;
!         }
!         return cert;
      }
  
--- 402,422 ----
  
      public final java.security.cert.Certificate[] getCertificateChain() {
!         return new Certificate[]{getCertificate()};
! //        final ArrayList certs = new ArrayList(3);
! //        Identity id = this;
! //        while (id != null) {
! //            certs.add(id.getCertificate());
! //            id = id.getSignatory();
! //        }
! //        certs.add(NEUROOT.getCertificate());
! //        certs.trimToSize();
! //        final Certificate[] cert = new Certificate[certs.size()];
! //        final Iterator iter = certs.iterator();
! //        int i = 0;
! //        while (iter.hasNext()) {
! //            final Certificate certificate = (java.security.cert.Certificate) iter.next();
! //            cert[i++] = certificate;
! //        }
! //        return cert;
      }
  
***************
*** 426,431 ****
  
      private final class NeuClearCertificate extends Certificate {
!         public NeuClearCertificate() {
              super("NeuClear");
  
          }
--- 431,437 ----
  
      private final class NeuClearCertificate extends Certificate {
!         public NeuClearCertificate(Identity id) {
              super("NeuClear");
+             this.id=id;
  
          }
***************
*** 439,443 ****
           */
          public final byte[] getEncoded() throws CertificateEncodingException {
!             return getEncoded();
          }
  
--- 445,449 ----
           */
          public final byte[] getEncoded() throws CertificateEncodingException {
!             return id.getEncoded().getBytes();
          }
  
***************
*** 474,478 ****
              return getName();
          }
! 
      }
  
--- 480,484 ----
              return getName();
          }
!         private final Identity id;
      }