marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2ptunnel: Disable shared clients (DSA), any server not

Browse Source 
supporting EdDSA doesn't support LS2.
This commit is contained in:
zzz
2020-12-29 15:51:51 -05:00
parent 62fce859b9
commit 0b59f53fe9
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
View File

@@ -307,9 +307,15 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))
_log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since there is no other one"); _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since there is no other one");
socketManager = buildSocketManager(tunnel, pkf); socketManager = buildSocketManager(tunnel, pkf);
/*
since we enabled ratchet by default, we're not compatible with ancient servers anyway.
I2PSession sub = addSubsession(tunnel); I2PSession sub = addSubsession(tunnel);
if (sub != null && _log.shouldLog(Log.WARN)) if (sub != null && _log.shouldLog(Log.WARN))
_log.warn("Added subsession " + sub); _log.warn("Added subsession " + sub);
*/
} }
return socketManager; return socketManager;
} }
@@ -319,7 +325,9 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
* *
* @return subsession, or null if none was added * @return subsession, or null if none was added
* @since 0.9.20 * @since 0.9.20
* @deprecated unused as of 0.9.49
*/ */
@Deprecated
protected static synchronized I2PSession addSubsession(I2PTunnel tunnel) { protected static synchronized I2PSession addSubsession(I2PTunnel tunnel) {
I2PSession sess = socketManager.getSession(); I2PSession sess = socketManager.getSession();
if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1) if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1)

2
apps/i2ptunnel/jsp/index.jsp
View File

@@ -18,7 +18,7 @@
<div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p> <div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p>
<%=intl._t("These are the local services provided by your router.")%> <%=intl._t("These are the local services provided by your router.")%>
&nbsp; &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> </p></div>
<% <%
boolean isInitialized = indexBean.isInitialized(); boolean isInitialized = indexBean.isInitialized();

1
apps/routerconsole/java/strings/Strings.java
View File

@@ -34,7 +34,6 @@ class Dummy {
// note that if the wording changes in i2ptunnel.config, we have to // note that if the wording changes in i2ptunnel.config, we have to
// keep the old string here as well for existing installs // keep the old string here as well for existing installs
_t("shared clients"); _t("shared clients");
_t("shared clients (DSA)");
_t("IRC proxy"); _t("IRC proxy");
_t("eepsite"); _t("eepsite");
_t("I2P webserver"); _t("I2P webserver");