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

i2ptunnel: Shared key is PSK

Browse Source
This commit is contained in:
zzz
2019-05-22 18:27:34 +00:00
parent 332898351c
commit ea5ddfcf36
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -568,12 +568,13 @@ public class GeneralHelper {
int rv;
String authType = getProperty(tunnel, "i2cp.leaseSetAuthType", "0");
if (authType.equals("2")) {
rv = 6;
} else if (authType.equals("1")) {
// shared DH key
// shared PSK key
rv = 4;
// per-client DH key
//rv = 8;
// per-client PSK key
// TODO
//rv = 6;
} else if (authType.equals("1")) {
rv = 8;
} else {
rv = 2;
}

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
View File

@@ -681,15 +681,15 @@ public class TunnelConfig {
config.remove(OPT + "i2cp.leaseSetAuthType");
break;
case 4: // blinded, shared key (implicit DH)
case 4: // blinded, shared key (implicit PSK)
config.put(OPT + "i2cp.leaseSetType", "5");
config.remove(OPT + "i2cp.leaseSetSecret");
config.put(OPT + "i2cp.leaseSetAuthType", "1");
config.put(OPT + "i2cp.leaseSetAuthType", "2");
break;
case 5: // blinded, secret, shared key (implicit DH)
case 5: // blinded, secret, shared key (implicit PSK)
config.put(OPT + "i2cp.leaseSetType", "5");
config.put(OPT + "i2cp.leaseSetAuthType", "1");
config.put(OPT + "i2cp.leaseSetAuthType", "2");
break;
case 6: // blinded, per-client PSK