[ca-certificates-java] 04/06: Always generate a JKS keystore instead of using the default format (Closes: #894979)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ca-certificates-java.

commit 36bee5da3677c3904f87fdeae319c0d7688f4186
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 13 14:07:19 2018 +0200

    Always generate a JKS keystore instead of using the default format (Closes: #894979)
---
 debian/changelog                                       | 2 ++
 src/main/java/org/debian/security/KeyStoreHandler.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dee9ad3..b8adb2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ca-certificates-java (20170931) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Always generate a JKS keystore instead of using the default format
+    (Closes: #894979)
   * Look for Java 10 and Java 11 when detecting the JRE
   * Standards-Version updated to 4.1.4
   * Switch to debhelper level 11
diff --git a/src/main/java/org/debian/security/KeyStoreHandler.java b/src/main/java/org/debian/security/KeyStoreHandler.java
index 6ed7c72..0f1edfa 100644
--- a/src/main/java/org/debian/security/KeyStoreHandler.java
+++ b/src/main/java/org/debian/security/KeyStoreHandler.java
@@ -56,7 +56,7 @@ class KeyStoreHandler {
      * Try to open an existing keystore or create an new one.
      */
     public void load() throws GeneralSecurityException, IOException, InvalidKeystorePasswordException {
-        KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+        KeyStore ks = KeyStore.getInstance("JKS");
         File file = new File(filename);
         FileInputStream in = null;
         if (file.canRead()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git