Changeset ea5ddfc

Timestamp:

May 22, 2019 6:27:34 PM (20 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

7858dbe

Parents:

3328983

Message:

i2ptunnel: Shared key is PSK

Location:

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui

Files:

• GeneralHelper.java (modified) (1 diff)
• TunnelConfig.java (modified) (1 diff)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java

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

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

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