Changeset a3fe746

Timestamp:

May 29, 2019 11:53:55 AM (10 months ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

e189236

Parents:

973aab8

Message:

store ls secret as b64

Files:

• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java (modified) (2 diffs)
• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java (modified) (1 diff)
• core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java (modified) (1 diff)
• router/java/src/net/i2p/router/client/ClientMessageEventListener.java (modified) (1 diff)

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

@@ -15 +15 @@
 import net.i2p.client.I2PClient;
 import net.i2p.crypto.SigType;
+import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
@@ -597 +598 @@
      */
     public String getBlindedPassword(int tunnel) {
-        return getProperty(tunnel, "i2cp.leaseSetSecret", "");
+        String rv = getProperty(tunnel, "i2cp.leaseSetSecret", null);
+        if (rv != null)
+            rv = DataHelper.getUTF8(Base64.decode(rv));
+        if (rv == null)
+            rv = "";
+        return rv;
     }
     

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

@@ -278 +278 @@
     public void setBlindedPassword(String s) {
         if (s != null && s.length() > 0)
-            _otherOptions.put("i2cp.leaseSetSecret", s);
+            _otherOptions.put("i2cp.leaseSetSecret", Base64.encode(DataHelper.getUTF8(s.trim())));
         else
             _otherOptions.remove("i2cp.leaseSetSecret");

core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java

@@ -133 +133 @@
                 EncryptedLeaseSet encls2 = new EncryptedLeaseSet();
                 String secret = session.getOptions().getProperty(PROP_SECRET);
-                if (secret != null)
+                if (secret != null) {
+                    secret = DataHelper.getUTF8(Base64.decode(secret));
                     encls2.setSecret(secret);
+                }
                 leaseSet = encls2;
             } else if (_ls2Type == DatabaseEntry.KEY_TYPE_META_LS2) {

router/java/src/net/i2p/router/client/ClientMessageEventListener.java

@@ -656 +656 @@
                 if (secret != null) {
                     EncryptedLeaseSet encls = (EncryptedLeaseSet) ls;
+                    secret = DataHelper.getUTF8(Base64.decode(secret));
                     encls.setSecret(secret);
                 }