* Random: Remove and deprecate some old classses

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;
         }

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

@@ -1,108 +0,0 @@
-package net.i2p.crypto;
-
-import java.util.Random;
-
-import net.i2p.I2PAppContext;
-import net.i2p.util.PooledRandomSource;
-import net.i2p.util.RandomSource;
-
-/**
- *
- */
-public class DummyPooledRandomSource extends PooledRandomSource {
-    public DummyPooledRandomSource(I2PAppContext context) {
-        super(context);
-    }
-    
-    @Override
-    protected void initializePool(I2PAppContext context) {
-        _pool = new RandomSource[POOL_SIZE];
-        for (int i = 0; i < POOL_SIZE; i++) {
-            _pool[i] = new DummyRandomSource(context);
-            _pool[i].nextBoolean();
-        }
-        _nextPool = 0;
-    }
-    
-    private class DummyRandomSource extends RandomSource {
-        private Random _prng;
-        public DummyRandomSource(I2PAppContext context) {
-            super(context);
-            // when we replace to have hooks for fortuna (etc), replace with
-            // a factory (or just a factory method)
-            _prng = new Random();
-        }
-
-        /**
-         * According to the java docs (http://java.sun.com/j2se/1.4.1/docs/api/java/util/Random.html#nextInt(int))
-         * nextInt(n) should return a number between 0 and n (including 0 and excluding n).  However, their pseudocode,
-         * as well as sun's, kaffe's, and classpath's implementation INCLUDES NEGATIVE VALUES.
-         * WTF.  Ok, so we're going to have it return between 0 and n (including 0, excluding n), since 
-         * thats what it has been used for.
-         *
-         */
-        @Override
-        public int nextInt(int n) {
-            if (n == 0) return 0;
-            int val = _prng.nextInt(n);
-            if (val < 0) val = 0 - val;
-            if (val >= n) val = val % n;
-            return val;
-        }
-
-        /**
-         * Like the modified nextInt, nextLong(n) returns a random number from 0 through n,
-         * including 0, excluding n.
-         */
-        @Override
-        public long nextLong(long n) {
-            long v = _prng.nextLong();
-            if (v < 0) v = 0 - v;
-            if (v >= n) v = v % n;
-            return v;
-        }
-
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public boolean nextBoolean() { return _prng.nextBoolean(); }
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public void nextBytes(byte buf[]) { _prng.nextBytes(buf); }
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public double nextDouble() { return _prng.nextDouble(); }
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public float nextFloat() { return _prng.nextFloat(); }
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public double nextGaussian() { return _prng.nextGaussian(); }
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public int nextInt() { return _prng.nextInt(); }
-        /**
-         * override as synchronized, for those JVMs that don't always pull via
-         * nextBytes (cough ibm)
-         */
-        @Override
-        public long nextLong() { return _prng.nextLong(); }
-    }
-}

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[];

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;