From 0b59f53fe9d46606cdcdba3aae04a32df86caa6e Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 29 Dec 2020 15:51:51 -0500
Subject: [PATCH] i2ptunnel: Disable shared clients (DSA), any server not
 supporting EdDSA doesn't support LS2.

---
 .../java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java   | 8 ++++++++
 apps/i2ptunnel/jsp/index.jsp                              | 2 +-
 apps/routerconsole/java/strings/Strings.java              | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index ea84603083..f84aa8575a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -307,9 +307,15 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
             if (_log.shouldLog(Log.INFO))
                 _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since there is no other one");
             socketManager = buildSocketManager(tunnel, pkf);
+
+/*
+   since we enabled ratchet by default, we're not compatible with ancient servers anyway.
+
             I2PSession sub = addSubsession(tunnel);
             if (sub != null && _log.shouldLog(Log.WARN))
                 _log.warn("Added subsession " + sub);
+*/
+
         }
         return socketManager;
     }
@@ -319,7 +325,9 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
      *
      *  @return subsession, or null if none was added
      *  @since 0.9.20
+     *  @deprecated unused as of 0.9.49
      */
+    @Deprecated
     protected static synchronized I2PSession addSubsession(I2PTunnel tunnel) {
         I2PSession sess = socketManager.getSession();
         if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1)
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index c502628f4f..551ec0cc2f 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -18,7 +18,7 @@
 <div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p>
 <%=intl._t("These are the local services provided by your router.")%>
 &nbsp;
-<%=intl._t("By default, most of your client services (email, HTTP proxy, IRC) will share the same set of tunnels and be listed as \"Shared Clients\" and \"Shared Clients(DSA)\".")%>
+<%=intl._t("By default, most of your client services (email, HTTP proxy, IRC) will share the same set of tunnels and be listed as \"Shared Clients\".")%>
 </p></div>
 <%
   boolean isInitialized = indexBean.isInitialized();
diff --git a/apps/routerconsole/java/strings/Strings.java b/apps/routerconsole/java/strings/Strings.java
index 420338eed3..8fd6f802bb 100644
--- a/apps/routerconsole/java/strings/Strings.java
+++ b/apps/routerconsole/java/strings/Strings.java
@@ -34,7 +34,6 @@ class Dummy {
         // note that if the wording changes in i2ptunnel.config, we have to
         // keep the old string here as well for existing installs
         _t("shared clients");
-        _t("shared clients (DSA)");
         _t("IRC proxy");
         _t("eepsite");
         _t("I2P webserver");
-- 
GitLab