Menu
▾
▴
[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/pki AlwaysTrueHostnameVerifier.java,1.2,1.3 ApacheXMLDSigner.java,1.11,1.12 CRLFileSource.java,1.2,1.3 CRLSource.java,1.2,1.3 CertPathVerifier.java,1.4,1.5 CertResolver.java,1.2,1.3 CertSource.java,1.2,1.3 CompositeKeyStore.java,1.5,1.6 DocumentDetail.java,1.2,1.3 DocumentResolver.java,1.2,1.3 KeyStoreFileProp.java,1.2,1.3 KeyStoreKeyManager.java,1.1,1.2 KeyStoreTrustManager.java,1.2,1.3 SMIMEDecrypter.java,1.3,1.4 SMIMEEncrypter.java,1.3,1.4 SMIMEHandler.java,1.3,1.4 XMLDSigner.java,1.2,1.3
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki
In directory sc8-pr-cvs1:/tmp/cvs-serv28830/src/hk/hku/cecid/phoenix/pki
Modified Files:
AlwaysTrueHostnameVerifier.java ApacheXMLDSigner.java
CRLFileSource.java CRLSource.java CertPathVerifier.java
CertResolver.java CertSource.java CompositeKeyStore.java
DocumentDetail.java DocumentResolver.java
KeyStoreFileProp.java KeyStoreKeyManager.java
KeyStoreTrustManager.java SMIMEDecrypter.java
SMIMEEncrypter.java SMIMEHandler.java XMLDSigner.java
Log Message:
Remove all unused imports.
convert all wildcard imports to non-wildcard imports.
Index: AlwaysTrueHostnameVerifier.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/AlwaysTrueHostnameVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AlwaysTrueHostnameVerifier.java 22 Sep 2003 08:04:43 -0000 1.2
--- AlwaysTrueHostnameVerifier.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 68,73 ****
package hk.hku.cecid.phoenix.pki;
- //import javax.net.ssl.SSLSession;
- //import javax.net.ssl.HostnameVerifier;
import com.sun.net.ssl.HostnameVerifier;
import org.apache.log4j.Logger;
--- 68,71 ----
Index: ApacheXMLDSigner.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/ApacheXMLDSigner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ApacheXMLDSigner.java 20 Aug 2003 08:02:10 -0000 1.11
--- ApacheXMLDSigner.java 11 Dec 2003 06:41:30 -0000 1.12
***************
*** 83,94 ****
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
- import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.utils.Constants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
- import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
/**
* This class hides the details for digital signature. The digital signature
--- 83,92 ----
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
import org.apache.xml.security.transforms.TransformationException;
+ import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.Constants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
/**
* This class hides the details for digital signature. The digital signature
Index: CRLFileSource.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/CRLFileSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CRLFileSource.java 9 Apr 2003 07:48:56 -0000 1.2
--- CRLFileSource.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 71,81 ****
import java.io.File;
import java.io.FileInputStream;
- import java.io.InputStream;
import java.io.IOException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
- import java.security.cert.CRLException;
import java.security.cert.X509CRL;
-
/**
* This class extends CRLSource to add initialization procedure for loading a
--- 71,80 ----
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+ import java.io.InputStream;
+ import java.security.cert.CRLException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509CRL;
/**
* This class extends CRLSource to add initialization procedure for loading a
Index: CRLSource.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/CRLSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CRLSource.java 9 Apr 2003 07:48:56 -0000 1.2
--- CRLSource.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 74,82 ****
import java.security.PublicKey;
import java.security.SignatureException;
- import java.security.cert.Certificate;
import java.security.cert.CRLException;
import java.security.cert.X509CRL;
import java.util.Date;
-
/**
* This is an abstract class for holding a X509 CRL instance. The functionality
--- 74,81 ----
import java.security.PublicKey;
import java.security.SignatureException;
import java.security.cert.CRLException;
+ import java.security.cert.Certificate;
import java.security.cert.X509CRL;
import java.util.Date;
/**
* This is an abstract class for holding a X509 CRL instance. The functionality
Index: CertPathVerifier.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/CertPathVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CertPathVerifier.java 9 Apr 2003 07:48:58 -0000 1.4
--- CertPathVerifier.java 11 Dec 2003 06:41:30 -0000 1.5
***************
*** 69,79 ****
package hk.hku.cecid.phoenix.pki;
import java.io.IOException;
! import java.security.*;
! import java.security.cert.*;
import java.util.ArrayList;
import org.apache.log4j.Logger;
- import hk.hku.cecid.phoenix.message.handler.ErrorMessages;
-
/**
* This class wraps the certificate path verification routine into a
--- 69,88 ----
package hk.hku.cecid.phoenix.pki;
+ import hk.hku.cecid.phoenix.message.handler.ErrorMessages;
import java.io.IOException;
! import java.security.InvalidAlgorithmParameterException;
! import java.security.KeyStore;
! import java.security.KeyStoreException;
! import java.security.NoSuchAlgorithmException;
! import java.security.cert.CertPath;
! import java.security.cert.CertPathBuilder;
! import java.security.cert.CertPathBuilderException;
! import java.security.cert.CertStore;
! import java.security.cert.CollectionCertStoreParameters;
! import java.security.cert.PKIXBuilderParameters;
! import java.security.cert.X509CertSelector;
! import java.security.cert.X509Certificate;
import java.util.ArrayList;
import org.apache.log4j.Logger;
/**
* This class wraps the certificate path verification routine into a
Index: CertResolver.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/CertResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CertResolver.java 5 May 2003 08:41:27 -0000 1.2
--- CertResolver.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 70,74 ****
import java.security.cert.Certificate;
-
/**
*
--- 70,73 ----
***************
*** 76,80 ****
* @version $Revision$
*/
-
public interface CertResolver {
--- 75,78 ----
Index: CertSource.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/CertSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CertSource.java 9 Apr 2003 07:48:59 -0000 1.2
--- CertSource.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 71,77 ****
import java.io.File;
import java.io.FileInputStream;
- import java.io.InputStream;
import java.io.IOException;
! import java.util.Date;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
--- 71,76 ----
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
! import java.io.InputStream;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
***************
*** 85,89 ****
import java.security.cert.CertificateNotYetValidException;
import java.security.cert.X509Certificate;
!
/**
* This class loads a X509 certificate file. Basically this class only acts as
--- 84,88 ----
import java.security.cert.CertificateNotYetValidException;
import java.security.cert.X509Certificate;
! import java.util.Date;
/**
* This class loads a X509 certificate file. Basically this class only acts as
Index: CompositeKeyStore.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/CompositeKeyStore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompositeKeyStore.java 4 Aug 2003 02:36:25 -0000 1.5
--- CompositeKeyStore.java 11 Dec 2003 06:41:30 -0000 1.6
***************
*** 69,76 ****
package hk.hku.cecid.phoenix.pki;
import java.io.File;
import java.io.FileInputStream;
- import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.ObjectInputStream;
--- 69,77 ----
package hk.hku.cecid.phoenix.pki;
+ import hk.hku.cecid.phoenix.common.util.Version;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
***************
*** 92,97 ****
import java.util.Hashtable;
import java.util.Vector;
- import hk.hku.cecid.phoenix.common.util.Version;
-
/**
* Composite keystore which manages keystores of different types. A typical
--- 93,96 ----
Index: DocumentDetail.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/DocumentDetail.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DocumentDetail.java 9 Apr 2003 07:49:00 -0000 1.2
--- DocumentDetail.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 70,74 ****
import java.io.InputStream;
-
/**
* A data structure class for holding the document attachment parameters.
--- 70,73 ----
Index: DocumentResolver.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/DocumentResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DocumentResolver.java 9 Apr 2003 07:49:01 -0000 1.2
--- DocumentResolver.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 71,79 ****
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
- import org.w3c.dom.Attr;
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
!
/**
* This class is needed by the Apache XML Security library for locating
--- 71,78 ----
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
! import org.w3c.dom.Attr;
/**
* This class is needed by the Apache XML Security library for locating
Index: KeyStoreFileProp.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/KeyStoreFileProp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeyStoreFileProp.java 9 Apr 2003 07:49:03 -0000 1.2
--- KeyStoreFileProp.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 70,74 ****
import java.io.Serializable;
-
/**
* This class represents the data structure for holding parameters for
--- 70,73 ----
Index: KeyStoreKeyManager.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/KeyStoreKeyManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** KeyStoreKeyManager.java 11 Sep 2003 08:58:09 -0000 1.1
--- KeyStoreKeyManager.java 11 Dec 2003 06:41:30 -0000 1.2
***************
*** 68,85 ****
package hk.hku.cecid.phoenix.pki;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.FileInputStream;
import java.io.File;
import java.net.Socket;
- import java.util.Enumeration;
- //import javax.net.ssl.X509KeyManager;
- import com.sun.net.ssl.X509KeyManager;
import java.security.KeyStore;
import java.security.KeyStoreException;
- import java.security.cert.Certificate;
- import java.security.cert.X509Certificate;
import java.security.Principal;
import java.security.PrivateKey;
import org.apache.log4j.Logger;
/**
--- 68,82 ----
package hk.hku.cecid.phoenix.pki;
! import com.sun.net.ssl.X509KeyManager;
import java.io.File;
+ import java.io.FileInputStream;
+ import java.io.InputStream;
import java.net.Socket;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.Principal;
import java.security.PrivateKey;
+ import java.security.cert.Certificate;
+ import java.security.cert.X509Certificate;
import org.apache.log4j.Logger;
/**
Index: KeyStoreTrustManager.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/KeyStoreTrustManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeyStoreTrustManager.java 10 Sep 2003 04:47:02 -0000 1.2
--- KeyStoreTrustManager.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 68,78 ****
package hk.hku.cecid.phoenix.pki;
- import java.util.Enumeration;
- //import javax.net.ssl.X509TrustManager;
import com.sun.net.ssl.X509TrustManager;
import java.security.KeyStore;
import java.security.KeyStoreException;
- import java.security.cert.X509Certificate;
import java.security.cert.CertificateException;
import org.apache.log4j.Logger;
/**
--- 68,77 ----
package hk.hku.cecid.phoenix.pki;
import com.sun.net.ssl.X509TrustManager;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.cert.CertificateException;
+ import java.security.cert.X509Certificate;
+ import java.util.Enumeration;
import org.apache.log4j.Logger;
/**
Index: SMIMEDecrypter.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/SMIMEDecrypter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMIMEDecrypter.java 9 Apr 2003 07:49:03 -0000 1.3
--- SMIMEDecrypter.java 11 Dec 2003 06:41:30 -0000 1.4
***************
*** 69,86 ****
package hk.hku.cecid.phoenix.pki;
! import java.io.*;
! import java.security.*;
!
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-
- import org.bouncycastle.mail.smime.parsers.SMIMEEncryptedParser;
import org.bouncycastle.cms.CMSException;
!
/**
A class for decrypting MimeBodyPart that was encrypted by SMIME.
*/
-
public class SMIMEDecrypter extends SMIMEHandler {
--- 69,86 ----
package hk.hku.cecid.phoenix.pki;
! import java.io.IOException;
! import java.security.GeneralSecurityException;
! import java.security.KeyStoreException;
! import java.security.NoSuchAlgorithmException;
! import java.security.PrivateKey;
! import java.security.UnrecoverableKeyException;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import org.bouncycastle.cms.CMSException;
! import org.bouncycastle.mail.smime.parsers.SMIMEEncryptedParser;
/**
A class for decrypting MimeBodyPart that was encrypted by SMIME.
*/
public class SMIMEDecrypter extends SMIMEHandler {
Index: SMIMEEncrypter.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/SMIMEEncrypter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMIMEEncrypter.java 9 Apr 2003 07:49:04 -0000 1.3
--- SMIMEEncrypter.java 11 Dec 2003 06:41:30 -0000 1.4
***************
*** 69,82 ****
package hk.hku.cecid.phoenix.pki;
! import java.io.*;
! import java.security.*;
! import java.security.cert.*;
!
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-
import org.bouncycastle.jce.provider.JDKX509CertificateFactory;
import org.bouncycastle.mail.smime.generators.SMIMEEncryptedGenerator;
-
/**
A generator of SMIME encryption. It only works properly with BouncyCastle 's
--- 69,80 ----
package hk.hku.cecid.phoenix.pki;
! import java.io.ByteArrayInputStream;
! import java.security.KeyStoreException;
! import java.security.cert.CertificateEncodingException;
! import java.security.cert.CertificateException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import org.bouncycastle.jce.provider.JDKX509CertificateFactory;
import org.bouncycastle.mail.smime.generators.SMIMEEncryptedGenerator;
/**
A generator of SMIME encryption. It only works properly with BouncyCastle 's
***************
*** 85,89 ****
by RSA.
*/
-
public class SMIMEEncrypter extends SMIMEHandler {
--- 83,86 ----
Index: SMIMEHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/SMIMEHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SMIMEHandler.java 20 May 2003 09:00:43 -0000 1.3
--- SMIMEHandler.java 11 Dec 2003 06:41:30 -0000 1.4
***************
*** 69,79 ****
package hk.hku.cecid.phoenix.pki;
! import java.security.*;
import javax.activation.CommandMap;
import javax.activation.MailcapCommandMap;
-
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-
/**
It is the base class of SMIMEEncrypter and SMIMEDecrypter. The BouncyCastle 's
--- 69,76 ----
package hk.hku.cecid.phoenix.pki;
! import java.security.Security;
import javax.activation.CommandMap;
import javax.activation.MailcapCommandMap;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
/**
It is the base class of SMIMEEncrypter and SMIMEDecrypter. The BouncyCastle 's
Index: XMLDSigner.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/XMLDSigner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLDSigner.java 9 Apr 2003 07:49:09 -0000 1.2
--- XMLDSigner.java 11 Dec 2003 06:41:30 -0000 1.3
***************
*** 72,76 ****
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
* This interface defines a standard way to have the document signed.
--- 72,75 ----
|
