From d347c58d1e4ea52e1b866b4041b1e75ab629e487 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 1 Nov 2014 17:37:15 +0100 Subject: [PATCH] Pull out setting dh keys (so devel launcher doesn't do it) --- src/org/cacert/gigi/DevelLauncher.java | 2 +- src/org/cacert/gigi/Launcher.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java index 2cc7f634..f7bd763c 100644 --- a/src/org/cacert/gigi/DevelLauncher.java +++ b/src/org/cacert/gigi/DevelLauncher.java @@ -56,7 +56,7 @@ public class DevelLauncher { dos.flush(); InputStream oldin = System.in; System.setIn(new ByteArrayInputStream(chunkConfig.toByteArray())); - Launcher.main(args); + Launcher.boot(); addDevelPage(); System.setIn(oldin); BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java index 33511ba5..a47c9bfd 100644 --- a/src/org/cacert/gigi/Launcher.java +++ b/src/org/cacert/gigi/Launcher.java @@ -48,9 +48,13 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; public class Launcher { public static void main(String[] args) throws Exception { + System.setProperty("jdk.tls.ephemeralDHKeySize", "4096"); + boot(); + } + + public static void boot() throws Exception { Locale.setDefault(Locale.ENGLISH); TimeZone.setDefault(TimeZone.getTimeZone("UTC")); - System.setProperty("jdk.tls.ephemeralDHKeySize", "4096"); GigiConfig conf = GigiConfig.parse(System.in); ServerConstants.init(conf.getMainProps()); -- 2.39.2