From fb7b5a2fb01e4f54cc60c1597fd496ddca73dd39 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Mon, 12 Oct 2015 10:24:46 +0000
Subject: [PATCH] Fix generated EC certificate's key size. Refactor exception chaining.
---
opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
index 0df5d19..ee94311 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
@@ -101,7 +101,7 @@
RSA("rsa", 2048, "SHA1WithRSA"),
/** Elliptic Curve key algorithm with 233 bits size and SHA1withECDSA signing algorithm. */
- EC("ec", 233, "SHA1withECDSA");
+ EC("ec", 256, "SHA1withECDSA");
/** Default key type used when none can be determined. */
public final static KeyType DEFAULT = RSA;
@@ -251,14 +251,14 @@
throw new KeyStoreException(msg.toString());
}
ks.deleteEntry(alias);
- FileOutputStream fs = new FileOutputStream(ksPath);
- ks.store(fs, pwd);
- fs.close();
+ try (final FileOutputStream fs = new FileOutputStream(ksPath))
+ {
+ ks.store(fs, pwd);
+ }
}
catch (Exception e)
{
- LocalizableMessage msg = ERR_CERTMGR_DELETE_ALIAS.get(alias, e.getMessage());
- throw new KeyStoreException(msg.toString());
+ throw new KeyStoreException(ERR_CERTMGR_DELETE_ALIAS.get(alias, e.getMessage()).toString(), e);
}
}
@@ -300,8 +300,7 @@
}
catch (Exception e)
{
- LocalizableMessage msg = ERR_CERTMGR_ADD_CERT.get(alias, e.getMessage());
- throw new KeyStoreException(msg.toString());
+ throw new KeyStoreException(ERR_CERTMGR_ADD_CERT.get(alias, e.getMessage()).toString(), e);
}
}
@@ -346,9 +345,7 @@
}
catch (Exception e)
{
- LocalizableMessage msg = ERR_CERTMGR_GEN_SELF_SIGNED_CERT.get(alias, e
- .getMessage());
- throw new KeyStoreException(msg.toString());
+ throw new KeyStoreException(ERR_CERTMGR_GEN_SELF_SIGNED_CERT.get(alias, e.getMessage()).toString(), e);
}
return ks;
}
@@ -378,8 +375,7 @@
}
catch (Exception e)
{
- LocalizableMessage msg = ERR_CERTMGR_TRUSTED_CERT.get(alias, e.getMessage());
- throw new KeyStoreException(msg.toString());
+ throw new KeyStoreException(ERR_CERTMGR_TRUSTED_CERT.get(alias, e.getMessage()).toString(), e);
}
}
--
Gitblit v1.10.0