From 34789fdb3096f36b80007a4af10e25b063ffeded Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 27 May 2022 09:29:49 -0400 Subject: [PATCH] Streaming: Improve error message on unsupported sig type Fallback to Ed25519 on error --- .../net/i2p/client/streaming/I2PSocketManagerFactory.java | 6 +++--- .../net/i2p/client/streaming/impl/I2PSocketManagerFull.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java index e071fe397..4c13b1013 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java @@ -474,11 +474,11 @@ public class I2PSocketManagerFactory { return rv; if (rv != null) st = rv.toString(); - getLog().logAlways(Log.WARN, "Unsupported sig type " + st + - ", reverting to " + I2PClient.DEFAULT_SIGTYPE); + getLog().logAlways(Log.WARN, "Tunnel configuration error: Unsupported sig type " + st + + ", reverting to EdDSA_SHA512_Ed25519"); } } - return I2PClient.DEFAULT_SIGTYPE; + return SigType.EdDSA_SHA512_Ed25519; } /** @since 0.9.7 */ diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index d3df31394..61044f4a2 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -328,7 +328,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { return rv; if (rv != null) st = rv.toString(); - _log.logAlways(Log.WARN, "Unsupported sig type " + st + + _log.logAlways(Log.WARN, "Tunnel configuration error: Unsupported sig type " + st + ", reverting to " + I2PClient.DEFAULT_SIGTYPE); // TODO throw instead? }