misc. minor cleanups

installer/resources/checklist.md

@@ -131,7 +131,7 @@
 
 ### Build and test
 
-1. `ant release`
+1. `ant release` or `ant releaseWithGeoIP` or `ant releaseWithJbigi`
 
   - Copy i2pinstall_${release.number}_windows.exe,
     console.ico, ../lib/izpack/rh.bat, and ../lib/izpack/VersionInfo_template.rc

router/java/src/net/i2p/router/LeaseSetKeys.java

@@ -62,10 +62,12 @@ public class LeaseSetKeys {
      *
      *  @param dest unused
      *  @param revocationKey unused, may be null
-     *  @param decryptionKeys non-null
+     *  @param decryptionKeys non-null, non-empty
      *  @since 0.9.44
      */
     public LeaseSetKeys(Destination dest, SigningPrivateKey revocationKey, List<PrivateKey> decryptionKeys) {
+        if (decryptionKeys.isEmpty())
+            throw new IllegalArgumentException("no keys");
         _revocationKey = revocationKey;
         PrivateKey elg = null;
         PrivateKey ec = null;

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

@@ -602,12 +602,12 @@ class ClientConnectionRunner {
                 hasElg = true;
             }
             if (hasElg) {
+                TransientSessionKeyManager tskm = new TransientSessionKeyManager(_context, tags, thresh);
                 if (hasEC) {
-                    TransientSessionKeyManager tskm = new TransientSessionKeyManager(_context, tags, thresh);
                     RatchetSKM rskm = new RatchetSKM(_context);
                     _sessionKeyManager = new MuxedSKM(tskm, rskm);
                 } else {
-                    _sessionKeyManager = new TransientSessionKeyManager(_context, tags, thresh);
+                    _sessionKeyManager = tskm;
                 }
             } else {
                 if (hasEC) {

router/java/src/net/i2p/router/crypto/ratchet/RatchetSessionTag.java

@@ -40,19 +40,13 @@ public class RatchetSessionTag {
     }
 
     /**
-     * We assume the data has enough randomness in it, so use the first 4 bytes for speed.
+     * We assume the data has enough randomness in it, so use 4 bytes for speed.
-     * If this is not the case, override in the extending class.
      */
     @Override
     public int hashCode() {
         return (int) _data;
     }
 
-    /**
-     * Warning - this returns true for two different classes with the same size
-     * and same data, e.g. SessionKey and SessionTag, but you wouldn't
-     * put them in the same Set, would you?
-     */
     @Override
     public boolean equals(Object obj) {
         if (obj == this) return true;