1 files changed, 21 insertions, 15 deletions
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java
index ad589a59..3769629e 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Container.java
@@ -290,20 +290,26 @@ public class Container {
     server.join();
   }
 
-  private void loadCACertificate(File keystoreFile, char[] passwd) {
-    try {
-      if (log.isTraceEnabled()) {
-        log.trace("local ca certificate from " + keystoreFile);
-      }
-      BufferedInputStream bis = new BufferedInputStream(new FileInputStream(keystoreFile));
-      KeyStore sslKeyStore = KeyStore.getInstance("JKS");
-      sslKeyStore.load(bis, passwd);
-      Certificate[] sslChain = sslKeyStore.getCertificateChain(TLSServerCA.MOCCA_TLS_SERVER_ALIAS);
-      caCertificate = sslChain[sslChain.length - 1];
-      bis.close();
-    } catch (Exception ex) {
-      log.error("Failed to load local ca certificate", ex);
-      log.warn("automated web certificate installation will not be available");
-    }
+  private void loadCACertificate(File keystoreFile, char[] passwd) {
+    caCertificate = getCACertificate(keystoreFile, passwd);
+    if (caCertificate == null)
+      log.warn("automated web certificate installation will not be available");
+  }
+
+  protected static Certificate getCACertificate(File keystoreFile, char[] passwd) {
+    try {
+      if (log.isTraceEnabled()) {
+        log.trace("local ca certificate from " + keystoreFile);
+      }
+      BufferedInputStream bis = new BufferedInputStream(new FileInputStream(keystoreFile));
+      KeyStore sslKeyStore = KeyStore.getInstance("JKS");
+      sslKeyStore.load(bis, passwd);
+      Certificate[] sslChain = sslKeyStore.getCertificateChain(TLSServerCA.MOCCA_TLS_SERVER_ALIAS);
+      bis.close();
+      return sslChain[sslChain.length - 1];
+    } catch (Exception ex) {
+      log.error("Failed to load local ca certificate", ex);
+      return null;
+    }
   }
 }