Router: Fix persistence of blinded privkey and timestamp

core/java/src/net/i2p/data/BlindData.java

@@ -1,5 +1,7 @@
 package net.i2p.data;
 
+import java.util.Date;
+
 import net.i2p.I2PAppContext;
 import net.i2p.crypto.Blinding;
 import net.i2p.crypto.SigType;
@@ -25,6 +27,7 @@ public class BlindData {
     private long _routingKeyGenMod;
     private boolean _secretRequired;
     private boolean _authRequired;
+    private long _date;
 
     /**
      * bits 3-0 including per-client bit
@@ -94,6 +97,7 @@ public class BlindData {
             _secretRequired = true;
         if (authKey != null)
             _authRequired = true;
+        _date = _context.clock().now();
         // defer until needed
         //calculate();
     }
@@ -244,6 +248,21 @@ public class BlindData {
         return _authRequired;
     }
 
+    /**
+     *  @since 0.9.41
+     */
+    public void setDate(long date) {
+        _date = date;
+    }
+
+    /**
+     *  @return creation date or as overridden by setDate()
+     *  @since 0.9.41
+     */
+    public long getDate() {
+        return _date;
+    }
+
     @Override
     public synchronized String toString() {
         calculate();
@@ -271,6 +290,7 @@ public class BlindData {
         else
             buf.append("\n\tDestination     : unknown");
         buf.append("\n\tB32             : ").append(toBase32());
+        buf.append("\n\tCreated         : ").append((new Date(_date)).toString());
         buf.append(']');
         return buf.toString();
     }

router/java/src/net/i2p/router/networkdb/kademlia/BlindCache.java

@@ -380,15 +380,15 @@ class BlindCache {
             privkey = null;
         }
         BlindData rv;
-        // TODO pass privkey
         if (ss[7].length() > 0) {
             Destination dest = new Destination(ss[7]);
             if (!spk.equals(dest.getSigningPublicKey()))
                 throw new DataFormatException("spk mismatch");
-            rv = new BlindData(_context, dest, st2, secret);
+            rv = new BlindData(_context, dest, st2, secret, auth, privkey);
         } else {
-            rv = new BlindData(_context, spk, st2, secret);
+            rv = new BlindData(_context, spk, st2, secret, auth, privkey);
         }
+        rv.setDate(time);
         return rv;
     }
 
@@ -402,8 +402,7 @@ class BlindCache {
         buf.append(spk.getType().getCode()).append(',');
         buf.append(bd.getBlindedSigType().getCode()).append(',');
         buf.append(bd.getAuthType()).append(',');
-        // timestamp todo
-        buf.append('0').append(',');
+        buf.append(bd.getDate()).append(',');
         buf.append(spk.toBase64()).append(',');
         String secret = bd.getSecret();
         if (secret != null && secret.length() > 0)