* Random: Remove and deprecate some old classses

This commit is contained in:
zzz
2010-03-08 00:48:56 +00:00
parent f98101afa6
commit 9eab44128a
6 changed files with 21 additions and 9 deletions

View File

@ -12,7 +12,7 @@ import net.i2p.crypto.CryptixAESEngine;
import net.i2p.crypto.DSAEngine; import net.i2p.crypto.DSAEngine;
import net.i2p.crypto.DummyDSAEngine; import net.i2p.crypto.DummyDSAEngine;
import net.i2p.crypto.DummyElGamalEngine; import net.i2p.crypto.DummyElGamalEngine;
import net.i2p.crypto.DummyPooledRandomSource; //import net.i2p.crypto.DummyPooledRandomSource;
import net.i2p.crypto.ElGamalAESEngine; import net.i2p.crypto.ElGamalAESEngine;
import net.i2p.crypto.ElGamalEngine; import net.i2p.crypto.ElGamalEngine;
import net.i2p.crypto.HMAC256Generator; import net.i2p.crypto.HMAC256Generator;
@ -29,7 +29,7 @@ import net.i2p.util.FileUtil;
import net.i2p.util.FortunaRandomSource; import net.i2p.util.FortunaRandomSource;
import net.i2p.util.KeyRing; import net.i2p.util.KeyRing;
import net.i2p.util.LogManager; import net.i2p.util.LogManager;
import net.i2p.util.PooledRandomSource; //import net.i2p.util.PooledRandomSource;
import net.i2p.util.RandomSource; import net.i2p.util.RandomSource;
/** /**
@ -729,12 +729,12 @@ public class I2PAppContext {
private void initializeRandom() { private void initializeRandom() {
synchronized (this) { synchronized (this) {
if (_random == null) { if (_random == null) {
if (true) //if (true)
_random = new FortunaRandomSource(this); _random = new FortunaRandomSource(this);
else if ("true".equals(getProperty("i2p.weakPRNG", "false"))) //else if ("true".equals(getProperty("i2p.weakPRNG", "false")))
_random = new DummyPooledRandomSource(this); // _random = new DummyPooledRandomSource(this);
else //else
_random = new PooledRandomSource(this); // _random = new PooledRandomSource(this);
} }
_randomInitialized = true; _randomInitialized = true;
} }

View File

@ -17,6 +17,8 @@ import net.i2p.data.DataHelper;
* (likely) small buffer to reduce the frequency of prng recalcs (though * (likely) small buffer to reduce the frequency of prng recalcs (though
* the recalcs are now more time consuming). * the recalcs are now more time consuming).
* *
* @deprecated Unused! See FortunaRandomSource
*
*/ */
public class BufferedRandomSource extends RandomSource { public class BufferedRandomSource extends RandomSource {
private byte _buffer[]; private byte _buffer[];

View File

@ -15,6 +15,9 @@ import net.i2p.data.Base64;
/** /**
* Maintain a set of PRNGs to feed the apps * Maintain a set of PRNGs to feed the apps
*
* @deprecated Unused! See FortunaRandomSource
*
*/ */
public class PooledRandomSource extends RandomSource { public class PooledRandomSource extends RandomSource {
private Log _log; private Log _log;

View File

@ -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 2010-03-05 zzz
* Console: * Console:
- Tag reseed messages - Tag reseed messages

View File

@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 9; public final static long BUILD = 10;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION); System.out.println("I2P Router version: " + FULL_VERSION);