James Moger
2012-11-29 87d72e9d7b175142f8de9856a0e2e497646eda2f
src/com/gitblit/authority/GitblitAuthority.java
@@ -17,6 +17,7 @@
import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.FlowLayout;
@@ -35,6 +36,7 @@
import java.io.FileWriter;
import java.io.FilenameFilter;
import java.io.IOException;
import java.net.URI;
import java.security.PrivateKey;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
@@ -296,6 +298,24 @@
         
         File caKeystore = new File(folder, X509Utils.CA_KEY_STORE);
         if (!caKeystore.exists()) {
            if (!X509Utils.unlimitedStrength) {
               // prompt to confirm user understands JCE Standard Strength encryption
               int res = JOptionPane.showConfirmDialog(GitblitAuthority.this, Translation.get("gb.jceWarning"),
                     Translation.get("gb.warning"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
               if (res != JOptionPane.YES_OPTION) {
                  if (Desktop.isDesktopSupported()) {
                     if (Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
                        try {
                           Desktop.getDesktop().browse(URI.create("http://www.oracle.com/technetwork/java/javase/downloads/index.html"));
                        } catch (IOException e) {
                        }
                     }
                  }
                  System.exit(1);
               }
            }
            // show certificate defaults dialog 
            certificateDefaultsButton.doClick();
            
@@ -307,16 +327,9 @@
   
   private boolean prepareX509Infrastructure() {
      if (caKeystorePassword == null) {
         JPasswordField pass = new JPasswordField(10){
            private static final long serialVersionUID = 1L;
            public void addNotify()
             {
                 super.addNotify();
                 requestFocusInWindow();
             }
         };
         JPasswordField pass = new JPasswordField(10);
         pass.setText(caKeystorePassword);
         pass.addAncestorListener(new RequestFocusListener());
         JPanel panel = new JPanel(new BorderLayout());
         panel.add(new JLabel(Translation.get("gb.enterKeystorePassword")), BorderLayout.NORTH);
         panel.add(pass, BorderLayout.CENTER);