[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/jce NeuClearCertificateFactory.java,1.7,1.8

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

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

Modified Files:
	NeuClearCertificateFactory.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: NeuClearCertificateFactory.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/jce/NeuClearCertificateFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NeuClearCertificateFactory.java	21 Nov 2003 04:45:11 -0000	1.7
--- NeuClearCertificateFactory.java	17 Dec 2003 12:45:57 -0000	1.8
***************
*** 35,38 ****
--- 35,42 ----
  $Id$
  $Log$
+ Revision 1.8  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.7  2003/11/21 04:45:11  pelle
  EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 85,104 ****
              //Identity id=(Identity) VerifyingReader.getInstance().read(inputStream);
              final BufferedReader d = new BufferedReader(new InputStreamReader(inputStream));
!             if (d.ready()) {
!                 final String name = d.readLine();
!                 if (name==null)
!                     throw new CertificateEncodingException("Certificate is empty");
!                 if (!NSTools.isValidName(name))
!                     throw new CertificateParsingException("Invalid format");
!                 Identity identity = null;
!                 identity = NSResolver.resolveIdentity(name);
!                 if (identity==null)
!                     throw new CertificateException("Invalid Certificate");
!                 return identity.getCertificate();
!             }
!             return null;
          } catch (NeuClearException e) {
              throw new CertificateException("NeuClear: Problem reading Certificate:"+e.getMessage());
!         } catch (IOException e) {
              throw new CertificateException("NeuClear: Problem reading Certificate:"+e.getMessage());
          }
--- 89,96 ----
              //Identity id=(Identity) VerifyingReader.getInstance().read(inputStream);
              final BufferedReader d = new BufferedReader(new InputStreamReader(inputStream));
!             return ((Identity)VerifyingReader.getInstance().read(inputStream)).getCertificate();
          } catch (NeuClearException e) {
              throw new CertificateException("NeuClear: Problem reading Certificate:"+e.getMessage());
!         } catch (XMLException e) {
              throw new CertificateException("NeuClear: Problem reading Certificate:"+e.getMessage());
          }