From a3fe0092ac9feda7bfbc87c810b32c639455796d Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 22 Jul 2020 17:18:23 +0000
Subject: [PATCH] i2ptunnel: Change CONNECT tunnel default sigType to EdDSA
(ticket #2749)
---
.../java/src/net/i2p/i2ptunnel/TunnelController.java | 4 ++--
.../java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index 9b91a1d226..34d5c4ad9f 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -863,10 +863,10 @@ public class TunnelController implements Logging {
if (!_config.containsKey(OPT_LOW_TAGS))
_config.setProperty(OPT_LOW_TAGS, "14");
}
- // same default logic as in EditBean.getSigType()
+ // same default logic as in EditBean.getSigType() and GeneralHelper.getSigType()
if (!isClient(type) ||
type.equals(TYPE_IRC_CLIENT) || type.equals(TYPE_STD_CLIENT) ||
- type.equals(TYPE_SOCKS) ||
+ type.equals(TYPE_SOCKS) || type.equals(TYPE_CONNECT) ||
type.equals(TYPE_SOCKS_IRC) || type.equals(TYPE_STREAMR_CLIENT) ||
type.equals(TYPE_HTTP_CLIENT)) {
if (!_config.containsKey(OPT_SIG_TYPE))
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 79f9a73ba8..627d81d71c 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -735,6 +735,7 @@ public class GeneralHelper {
TunnelController.TYPE_SOCKS.equals(ttype) ||
TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) ||
TunnelController.TYPE_STD_CLIENT.equals(ttype) ||
+ TunnelController.TYPE_CONNECT.equals(ttype) ||
TunnelController.TYPE_HTTP_CLIENT.equals(ttype))
type = TunnelController.PREFERRED_SIGTYPE;
else
--
GitLab