Changeset 896af2c

Timestamp:

Jun 25, 2016 10:20:27 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

3baa08a

Parents:

2c3311b

Message:

Utils: Improve random seed initialization
Fallback to Random rather than try SecureRandom? twice
Fetch from SecureRandom? incrementally
Remove log warning

Location:

core/java/src/net/i2p/util

Files:

• FortunaRandomSource.java (modified) (2 diffs)
• RandomSource.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.Random;
 
 import net.i2p.I2PAppContext;
@@ -41 +42 @@
         } else {
             // may block forever
-            SecureRandom sr = new SecureRandom();
+            //SecureRandom sr = new SecureRandom();
+            // SecureRandom already failed in initSeed(), so try Random
+            Random sr = new Random();
             sr.nextBytes(seed);
             _fortuna.seed(seed);

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

@@ -196 +196 @@
                 if (ok)
                     System.arraycopy(tbuf, 0, buf, 0, buf.length);
-                else
-                    System.out.println("INFO: SecureRandom init failed or took too long");
+                // See FortunaRandomSource constructor for fallback
+                //else
+                //    System.out.println("INFO: SecureRandom init failed or took too long");
             }
         } catch (InterruptedException ie) {}
@@ -219 +220 @@
     private static class SecureRandomInit implements Runnable {
         private final byte[] buf;
+        private static final int SZ = 64;
 
         public SecureRandomInit(byte[] buf) {
@@ -225 +227 @@
 
         public void run() {
-            byte[] buf2 = new byte[buf.length];
+            byte[] buf2 = new byte[SZ];
+            // do this 64 bytes at a time, so if system is low on entropy we will
+            // hopefully get something before the timeout
             try {
-                SecureRandom.getInstance("SHA1PRNG").nextBytes(buf2);
-                synchronized(buf) {
-                    System.arraycopy(buf2, 0, buf, 0, buf.length);
+                SecureRandom sr = SecureRandom.getInstance("SHA1PRNG");
+                for (int i = 0; i < buf.length; i += SZ) {
+                    sr.nextBytes(buf2);
+                    synchronized(buf) {
+                        System.arraycopy(buf2, 0, buf, i, Math.min(SZ, buf.length - i));
+                    }
                 }
             } catch (NoSuchAlgorithmException e) {}