diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index c95065a73..aac61d4be 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/core/java/src/net/i2p/I2PAppContext.java @@ -12,7 +12,7 @@ import net.i2p.crypto.CryptixAESEngine; import net.i2p.crypto.DSAEngine; import net.i2p.crypto.DummyDSAEngine; import net.i2p.crypto.DummyElGamalEngine; -import net.i2p.crypto.DummyPooledRandomSource; +//import net.i2p.crypto.DummyPooledRandomSource; import net.i2p.crypto.ElGamalAESEngine; import net.i2p.crypto.ElGamalEngine; import net.i2p.crypto.HMAC256Generator; @@ -29,7 +29,7 @@ import net.i2p.util.FileUtil; import net.i2p.util.FortunaRandomSource; import net.i2p.util.KeyRing; import net.i2p.util.LogManager; -import net.i2p.util.PooledRandomSource; +//import net.i2p.util.PooledRandomSource; import net.i2p.util.RandomSource; /** @@ -729,12 +729,12 @@ public class I2PAppContext { private void initializeRandom() { synchronized (this) { if (_random == null) { - if (true) + //if (true) _random = new FortunaRandomSource(this); - else if ("true".equals(getProperty("i2p.weakPRNG", "false"))) - _random = new DummyPooledRandomSource(this); - else - _random = new PooledRandomSource(this); + //else if ("true".equals(getProperty("i2p.weakPRNG", "false"))) + // _random = new DummyPooledRandomSource(this); + //else + // _random = new PooledRandomSource(this); } _randomInitialized = true; } diff --git a/core/java/src/net/i2p/util/BufferedRandomSource.java b/core/java/src/net/i2p/util/BufferedRandomSource.java index c6ecd2740..b9760af91 100644 --- a/core/java/src/net/i2p/util/BufferedRandomSource.java +++ b/core/java/src/net/i2p/util/BufferedRandomSource.java @@ -17,6 +17,8 @@ import net.i2p.data.DataHelper; * (likely) small buffer to reduce the frequency of prng recalcs (though * the recalcs are now more time consuming). * + * @deprecated Unused! See FortunaRandomSource + * */ public class BufferedRandomSource extends RandomSource { private byte _buffer[]; diff --git a/core/java/src/net/i2p/util/PooledRandomSource.java b/core/java/src/net/i2p/util/PooledRandomSource.java index 29ee8ba05..e0beb46f8 100644 --- a/core/java/src/net/i2p/util/PooledRandomSource.java +++ b/core/java/src/net/i2p/util/PooledRandomSource.java @@ -15,6 +15,9 @@ import net.i2p.data.Base64; /** * Maintain a set of PRNGs to feed the apps + * + * @deprecated Unused! See FortunaRandomSource + * */ public class PooledRandomSource extends RandomSource { private Log _log; diff --git a/core/java/src/net/i2p/crypto/DummyPooledRandomSource.java b/core/java/test/net/i2p/crypto/DummyPooledRandomSource.java similarity index 100% rename from core/java/src/net/i2p/crypto/DummyPooledRandomSource.java rename to core/java/test/net/i2p/crypto/DummyPooledRandomSource.java diff --git a/history.txt b/history.txt index 0be42d01d..1e225b7be 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2010-03-08 zzz + * Floodfills: Increase max to 60 (was 28) and min to 45 (was 20) + * i2psnark: Better track outgoing bandwidth by incrementing + counter before the blocking write + * Random: Remove and deprecate some old classses + * Reseeder: Reduce max response size to 1MB (was 8MB) + 2010-03-05 zzz * Console: - Tag reseed messages diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ba0438a26..f77e09b81 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 9; + public final static long BUILD = 10; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION);