From 80966d60c1503e3b3c9d9d469ab7b8257bb2bc0d Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 23 Oct 2016 16:38:26 +0000
Subject: [PATCH] Crypto: Create keystore directory when making SSL keys
 (ticket #1866) When we switched to new way of making keys in 0.9.25, we
 omitted the mkdir step, which broke it.

---
 core/java/src/net/i2p/crypto/KeyStoreUtil.java    |  6 ++++++
 history.txt                                       | 15 +++++++++++++++
 router/java/src/net/i2p/router/RouterVersion.java |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/core/java/src/net/i2p/crypto/KeyStoreUtil.java b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
index d6d12bf2dc..e99cec8f12 100644
--- a/core/java/src/net/i2p/crypto/KeyStoreUtil.java
+++ b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
@@ -591,6 +591,12 @@ public final class KeyStoreUtil {
     public static Object[] createKeysAndCRL(File ks, String ksPW, String alias, String cname, String ou,
                                             int validDays, SigType type, String keyPW)
                                                 throws GeneralSecurityException, IOException {
+        File dir = ks.getParentFile();
+        if (dir != null && !dir.exists()) {
+            File sdir = new SecureDirectory(dir.getAbsolutePath());
+            if (!sdir.mkdirs())
+                throw new IOException("Can't create directory " + dir);
+        }
         Object[] rv = SelfSignedGenerator.generate(cname, ou, "XX", "I2P Anonymous Network", "XX", "XX", validDays, type);
         PublicKey jpub = (PublicKey) rv[0];
         PrivateKey jpriv = (PrivateKey) rv[1];
diff --git a/history.txt b/history.txt
index fcd5ec3ecf..7e0a9bbb32 100644
--- a/history.txt
+++ b/history.txt
@@ -1,8 +1,23 @@
+2016-10-23 zzz
+ * Crypto: Create keystore directory when making SSL keys (ticket #1866)
+
+2016-10-22 zzz
+ * Build: Fix jbigi build in Arch Linux and others for Java 8 (ticket #1863)
+ * Console:
+   - New Korean translation
+   - New Chinese (Taiwan) translations for susidns, susimail, debian
+   - New initial news translations: Czech, Greek
+ * Jetty 8.1.21.v20160908
+
 2016-10-21 zzz
+ * Console:
+   - New Galician translation
+   - Remove calls to deprecated two-arg setStatus()
  * Crypto: Actually use a random nonzero byte in ElGamal
  * Data: Cache serialized leasesets on floodfills
  * NetDB: Disallow RSA for RI or LS
  * Tomcat 6.0.47
+ * Utils: Add MTU to command line utils
  * Wrapper 3.5.30
 
 2016-10-20 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 282c18b422..0725033fa6 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";