Changeset 5898 for branches/2.3/security/ExpressoCertLogin/src

Timestamp:

04/09/12 15:21:57 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2256 - Problemas com o token iKey 2032 / 4000.

File:

• branches/2.3/security/ExpressoCertLogin/src/LoginApplet.java (modified) (1 diff)

branches/2.3/security/ExpressoCertLogin/src/LoginApplet.java

@@ -176 +176 @@
                     case DigitalCertificate.KEYSTORE_DETECTED:
                         // Mostra PinNeedeDialog.
-                        String pin = DialogBuilder.showPinDialog((Frame) SwingUtilities.getAncestorOfClass(Frame.class, this), this.setup);
-                        
-                        if (pin != null) {
-                            dc.openKeyStore(pin.toCharArray());
+                        char[] pin = null;
+                        if (!DigitalCertificate.isUseMSCapi()){
+                            String sPin = DialogBuilder.showPinDialog((Frame) SwingUtilities.getAncestorOfClass(Frame.class, this), this.setup);
+                            if (sPin != null) {
+                                pin = sPin.toCharArray();
+                            }
+                        }
+                        if (DigitalCertificate.isUseMSCapi() || pin != null) {
+                            dc.openKeyStore(pin);
                             if (documentURL.getPath().matches(".*login.php$")){
-                                tryAgain = parseVercert(dc.getCredentials(pin, new URL(this.getCodeBase().getProtocol()+"://" +
+
+                                tryAgain = pin == null ? parseVercert(dc.getCredentials(null, new URL(this.getCodeBase().getProtocol()+"://" +
+                                    this.getCodeBase().getHost() + ":" + this.getCodeBase().getPort() +
+                                    "/security/vercert.php")), dc.getPEMCertificate()) :
+                                    parseVercert(dc.getCredentials(new String(pin), new URL(this.getCodeBase().getProtocol()+"://" +
                                     this.getCodeBase().getHost() + ":" + this.getCodeBase().getPort() +
                                     "/security/vercert.php")), dc.getPEMCertificate());