Merge pull request #52 from safing/fix/make-second-os-rng-feed-async

Make second OS rng feed async

rng/rng.go

@@ -1,6 +1,7 @@
 package rng
 
 import (
+	"context"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/rand"
@@ -49,14 +50,22 @@ func start() error {
 		return errors.New("failed to initialize rng")
 	}
 
-	// explicitly add randomness
+	// add another (async) OS rng seed
-	osEntropy := make([]byte, minFeedEntropy/8)
+	module.StartWorker("initial rng feed", func(_ context.Context) error {
-	_, err := rand.Read(osEntropy)
+		// get entropy from OS
-	if err != nil {
+		osEntropy := make([]byte, minFeedEntropy/8)
-		return fmt.Errorf("could not read entropy from os: %s", err)
+		_, err := rand.Read(osEntropy)
-	}
+		if err != nil {
-	rng.Reseed(osEntropy)
+			return fmt.Errorf("could not read entropy from os: %s", err)
+		}
+		// feed
+		rngLock.Lock()
+		rng.Reseed(osEntropy)
+		rngLock.Unlock()
+		return nil
+	})
 
+	// mark as ready
 	rngReady = true
 
 	// random source: OS