From ea5ddfcf362df98e364ddc9e5f94f0f37398f859 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 22 May 2019 18:27:34 +0000
Subject: [PATCH] i2ptunnel: Shared key is PSK

---
 .../java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java  | 11 ++++++-----
 .../java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java   |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
index bc524782f..57c10f1b2 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
@@ -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;
             }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
index f167b1720..afd8f8722 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
@@ -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