From 09f68e44ca913cffd4beeca8888d62303173d65a Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 10 Jun 2015 23:24:38 +0000
Subject: [PATCH] enable ECDSA by default for shared clients
---
.../java/src/net/i2p/i2ptunnel/TunnelController.java | 6 +++---
.../java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index 2066911ada..d5ca354c59 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -651,9 +651,9 @@ public class TunnelController implements Logging {
}
// same default logic as in EditBean.getSigType()
if (!isClient(type) ||
- ((type.equals(TYPE_IRC_CLIENT) || type.equals(TYPE_STD_CLIENT) ||
- type.equals(TYPE_SOCKS_IRC) || type.equals(TYPE_STREAMR_CLIENT))
- && !Boolean.valueOf(getSharedClient()))) {
+ type.equals(TYPE_IRC_CLIENT) || type.equals(TYPE_STD_CLIENT) ||
+ type.equals(TYPE_SOCKS_IRC) || type.equals(TYPE_STREAMR_CLIENT) ||
+ (type.equals(TYPE_HTTP_CLIENT) && Boolean.valueOf(getSharedClient()))) {
if (!_config.containsKey(OPT_SIG_TYPE))
_config.setProperty(OPT_SIG_TYPE, PREFERRED_SIGTYPE.name());
}
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index 2073efdf23..0cc4e52788 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -439,12 +439,12 @@ public class GeneralHelper {
}
if (type == null) {
// same default logic as in TunnelController.setConfig()
- if ((!TunnelController.isClient(ttype) ||
- ((TunnelController.TYPE_IRC_CLIENT.equals(ttype) ||
- TunnelController.TYPE_SOCKS_IRC.equals(ttype) ||
- TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) ||
- TunnelController.TYPE_STD_CLIENT.equals(ttype)) &&
- !isShared)))
+ if (!TunnelController.isClient(ttype) ||
+ TunnelController.TYPE_IRC_CLIENT.equals(ttype) ||
+ TunnelController.TYPE_SOCKS_IRC.equals(ttype) ||
+ TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) ||
+ TunnelController.TYPE_STD_CLIENT.equals(ttype) ||
+ (TunnelController.TYPE_HTTP_CLIENT.equals(ttype) && isShared))
type = TunnelController.PREFERRED_SIGTYPE;
else
type = SigType.DSA_SHA1;
--
GitLab