From 6fede7f5247bbb925e9cd95b2e5b4e7e6ffb8693 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 22 Sep 2013 14:13:50 +0000
Subject: [PATCH] log tweaks
---
core/java/src/net/i2p/crypto/KeyStoreUtil.java | 8 ++++++++
core/java/src/net/i2p/crypto/SU3File.java | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/core/java/src/net/i2p/crypto/KeyStoreUtil.java b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
index b73815bf6f..a367534912 100644
--- a/core/java/src/net/i2p/crypto/KeyStoreUtil.java
+++ b/core/java/src/net/i2p/crypto/KeyStoreUtil.java
@@ -326,7 +326,10 @@ public class KeyStoreUtil {
if (success) {
try {
success = getPrivateKey(ks, ksPW, alias, keyPW) != null;
+ if (!success)
+ error("Key gen failed to get private key", null);
} catch (Exception e) {
+ error("Key gen failed to get private key", e);
success = false;
}
}
@@ -458,6 +461,11 @@ public class KeyStoreUtil {
}
private static void log(I2PAppContext ctx, int level, String msg, Throwable t) {
+ if (level >= Log.WARN && !ctx.isRouterContext()) {
+ System.out.println(msg);
+ if (t != null)
+ t.printStackTrace();
+ }
Log l = ctx.logManager().getLog(KeyStoreUtil.class);
l.log(level, msg, t);
}
diff --git a/core/java/src/net/i2p/crypto/SU3File.java b/core/java/src/net/i2p/crypto/SU3File.java
index 1d8d7f124a..bf4c6b165d 100644
--- a/core/java/src/net/i2p/crypto/SU3File.java
+++ b/core/java/src/net/i2p/crypto/SU3File.java
@@ -695,13 +695,13 @@ public class SU3File {
alias, "I2P", 3652, type.getBaseAlgorithm().getName(),
keylen, keypw);
if (!success) {
- System.err.println("Error writing keys:");
+ System.err.println("Error creating keys for " + alias);
return false;
}
File outfile = new File(publicKeyFile);
success = KeyStoreUtil.exportCert(ksFile, KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD, alias, outfile);
if (!success) {
- System.err.println("Error writing keys:");
+ System.err.println("Error writing public key for " + alias + " to " + outfile);
return false;
}
return true;
--
GitLab