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

enable ECDSA by default for shared clients

Browse Source
This commit is contained in:
zzz
2015-06-10 23:24:38 +00:00
parent 013b5fd85b
commit 09f68e44ca
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@@ -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());
}

12
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
View File

@@ -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;