Changeset 4198 for branches/2.2.0.1/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java

Timestamp:

05/03/11 15:58:45 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1813 - Problema com mais de um driver de token configurado.

File:

• branches/2.2.0.1/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (7 diffs)

branches/2.2.0.1/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java

@@ -2 +2 @@
 
 import br.gov.serpro.setup.Setup;
+import br.gov.serpro.cert.Token;
 import java.awt.Frame;
 import java.io.ByteArrayInputStream;
@@ -58 +59 @@
 import java.io.OutputStreamWriter;
 import java.security.AlgorithmParameters;
+import java.security.NoSuchProviderException;
 import java.security.cert.CertificateEncodingException;
 import java.util.regex.Matcher;
@@ -256 +258 @@
         // TODO: Usar dentro de um "loop" para testar outros modelos de tokens.
         this.tokens = new TokenCollection(setup);
-        int interfaceType = DigitalCertificate.KEYSTORE_DETECTED;
+
+        Provider[] providers = Security.getProviders();
+        if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+            for (Provider provider : providers) {
+                System.out.println(provider.getInfo());
+            }
+        }
+
+        int interfaceType = DigitalCertificate.KEYSTORE_DETECTED;
 
         try {
@@ -264 +274 @@
         } catch (Exception e1) {
 
-            Provider[] providers = Security.getProviders();
             if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
-                for (Provider provider : providers) {
-                    System.out.println(provider.getInfo());
-                }
-
                 // Não conseguiu abrir o token (ePass2000).
                 System.out.println("Erro ao ler o token: " + e1.getMessage());
@@ -746 +751 @@
      *                                                   ou Smartcard não foi encontrada, ou o usuário não inseriu o Token.
      */
-    private void loadKeyStore() throws KeyStoreException {
-
-        //Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(new ByteArrayInputStream(pkcs11Config.getBytes()));
-        //Security.addProvider(pkcs11Provider);
-        this.keyStore = KeyStore.getInstance("PKCS11");
-        this.providerName = keyStore.getProvider().getName();
-
+    private void loadKeyStore() throws GeneralSecurityException {
+
+        try{
+            if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+                System.out.println("Carregando provider: PKCS11");
+            }
+            this.keyStore = KeyStore.getInstance("PKCS11");
+            this.providerName = keyStore.getProvider().getName();
+        }
+        catch (GeneralSecurityException kex){
+            if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+                System.out.println("Erro ao carregar provider: PKCS11");
+                Throwable cause = kex.getCause();
+                kex.printStackTrace();
+                if (cause != null){
+                    cause.printStackTrace();
+                }
+            }
+            throw kex;
+        }
     }
 
@@ -779 +797 @@
                 this.cert = this.keyStore.getCertificate(this.selectedCertificateAlias);
             
-                System.out.println("Aliases (" + this.keyStore.size() + "): ");
                 if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+                    System.out.println("Aliases (" + this.keyStore.size() + "): ");
                     for (Enumeration alias = this.keyStore.aliases(); alias.hasMoreElements();) {
                         System.out.println(alias.nextElement());
@@ -808 +826 @@
      */
     public String getPEMCertificate() throws CertificateEncodingException {
-        return Base64Utils.der2pem(this.cert.getEncoded());
+        if (this.cert != null){
+            return Base64Utils.der2pem(this.cert.getEncoded());
+        }
+        return null;
+
     }