Changeset 04e6beb

Timestamp:

Jul 30, 2013 10:05:46 PM (8 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

5941a52

Parents:

1284c7a

Message:

javadoc, log, comment, and su3file help tweaks

Files:

• core/java/src/net/i2p/crypto/SU3File.java (modified) (1 diff)
• core/java/src/net/i2p/data/Destination.java (modified) (1 diff)
• core/java/src/net/i2p/data/LeaseSet.java (modified) (1 diff)
• core/java/src/net/i2p/util/RandomSource.java (modified) (2 diffs)
• router/java/src/net/i2p/router/tunnel/OutboundTunnelEndpoint.java (modified) (2 diffs)
• router/java/src/net/i2p/router/tunnel/ThrottledPumpedTunnelGateway.java (modified) (1 diff)
• router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java (modified) (1 diff)

core/java/src/net/i2p/crypto/SU3File.java

@@ -359 +359 @@
 
     private static final void showUsageCLI() {
-        System.err.println("Usage: SU3File showversion   signedFile");
-        System.err.println("       SU3File sign          inputFile signedFile privateKeyFile version signerName");
-        System.err.println("       SU3File verifysig     signedFile");
+        System.err.println("Usage: SU3File showversion   signedFile.su3");
+        System.err.println("       SU3File sign          inputFile.zip signedFile.su3 privateKeyFile version signerName@mail.i2p");
+        System.err.println("       SU3File verifysig     signedFile.su3");
     }
 

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

@@ -13 +13 @@
  * Defines an end point in the I2P network.  The Destination may move around
  * in the network, but messages sent to the Destination will find it
+ *
+ * Note that the public (encryption) key is essentially unused, since
+ * "end-to-end" encryption was removed in 0.6. The public key in the
+ * LeaseSet is used instead.
+ *
+ * The first bytes of the public key are used for the IV for leaseset encryption,
+ * but that encryption is poorly designed and should be deprecated.
  *
  * @author jrandom

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

@@ -31 +31 @@
  * Only the gateways and tunnel IDs in the individual
  * leases are encrypted.
+ *
+ * WARNING:
+ * Encryption is poorly designed and probably insecure.
+ * Not recommended.
  *
  * Encrypted leases are not indicated as such.

core/java/src/net/i2p/util/RandomSource.java

@@ -177 +177 @@
             ok = true;
         } catch (NoSuchAlgorithmException e) {}
-        // why urandom?  because /dev/random blocks, and there are arguments
-        // suggesting such blockages are largely meaningless
+        // why urandom?  because /dev/random blocks
         ok = seedFromFile(new File("/dev/urandom"), buf) || ok;
         // we merge (XOR) in the data from /dev/urandom with our own seedfile
@@ -187 +186 @@
     
     /**
+     *  XORs the seed into buf
+     *
      *  @param f absolute path
      *  @return success

router/java/src/net/i2p/router/tunnel/OutboundTunnelEndpoint.java

@@ -30 +30 @@
         _outDistributor = new OutboundMessageDistributor(ctx, OutNetMessage.PRIORITY_PARTICIPATING);
     }
+
     public void dispatch(TunnelDataMessage msg, Hash recvFrom) {
         _config.incrementProcessedMessages();
@@ -67 +68 @@
         }
     }
+
+    /** @since 0.9.8 */
+    @Override
+    public String toString() {
+        return "OBEP " + _config.getReceiveTunnel();
+    }
 }

router/java/src/net/i2p/router/tunnel/ThrottledPumpedTunnelGateway.java

@@ -45 +45 @@
         add(new PendingGatewayMessage(msg, toRouter, toTunnel));
     }
+
+    /** @since 0.9.8 */
+    @Override
+    public String toString() {
+        return "IBGW " + _config.getReceiveTunnel();
+    }
 }

router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java

@@ -492 +492 @@
         if (removed) {
             if (_log.shouldLog(Log.DEBUG))
-                _log.debug("removing " + cfg, new Exception());
+                _log.debug("removing " + cfg /* , new Exception() */ );
         } else {
             // this is normal, this can get called twice
             if (_log.shouldLog(Log.DEBUG))
-                _log.debug("Participating tunnel, but no longer listed in participatingConfig? " + cfg, new Exception());
+                _log.debug("Participating tunnel, but no longer listed in participatingConfig? " + cfg /* , new Exception() */ );
         }