From b44cb868008c06d50b0a5d354931ccad83a84f80 Mon Sep 17 00:00:00 2001
From: Csaba Kiraly <csaba.kiraly@gmail.com>
Date: Thu, 23 Sep 2021 01:13:31 +0200
Subject: [PATCH] change random number generator to a secure one

Use Rng based on BrHmacDrbgContext

Signed-off-by: Csaba Kiraly <csaba.kiraly@gmail.com>
---
 dagger/storageproofs/bls.nim     | 11 +++++------
 dagger/storageproofs/testbls.nim |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dagger/storageproofs/bls.nim b/dagger/storageproofs/bls.nim
index 76284c07..0f6212bd 100644
--- a/dagger/storageproofs/bls.nim
+++ b/dagger/storageproofs/bls.nim
@@ -78,7 +78,7 @@
 
 import blscurve
 import blscurve/blst/blst_abi
-import random
+import ../rng
 
 const sectorsperblock = 1024.int64
 const bytespersector = 31 # r is 255 bits long 
@@ -126,7 +126,7 @@ proc rndScalar(): blst_scalar =
 
   while true:
     for val in scal.mitems:
-      val = byte rand(0xFF)
+      val = byte Rng.instance.rand(0xFF)
     scalar.blst_scalar_from_bendian(scal)
     if blst_scalar_fr_check(scalar).bool:
       break
@@ -154,10 +154,9 @@ proc keygen*(): (PublicKey, SecretKey) =
   var pk: PublicKey
   var sk: SecretKey
   var ikm: array[32, byte]
-  var RNG = initRand(0xFACADE)
 
   for b in ikm.mitems:
-    b = byte RNG.rand(0xFF)
+    b = byte Rng.instance.rand(0xFF)
   doAssert ikm.keyGen(pk.signkey, sk.signkey)
 
   (pk.key, sk.key) = posKeygen()
@@ -198,7 +197,7 @@ proc st*(ssk: SecretKey, filename: string): (Tau, seq[blst_p1]) =
 
   # generate a random name
   for i in 0 ..< 512 :
-    t.name[i] = rand(byte)
+    t.name[i] = byte Rng.instance.rand(0xFF)
 
   # generate the coefficient vector for combining sectors of a block: U
   for i  in 0 ..< s :
@@ -231,7 +230,7 @@ proc generateQuery*(
 
   for i in 0 ..< l :
     var q: QElement
-    q.I = rand((int)n-1) #TODO: dedup
+    q.I = Rng.instance.rand(n-1) #TODO: dedup
     q.V = rndScalar() #TODO: fix range
     result.add(q)
 
diff --git a/dagger/storageproofs/testbls.nim b/dagger/storageproofs/testbls.nim
index 390d3201..3ac2792a 100644
--- a/dagger/storageproofs/testbls.nim
+++ b/dagger/storageproofs/testbls.nim
@@ -8,7 +8,6 @@
 ## those terms.
 
 import bls
-import random
 import benchmark
 import strutils
 
@@ -32,5 +31,4 @@ proc testbls() : bool =
     result = bls.verifyProof(tau, q, mu, sigma, spk)
   echo "Result: ", result
 
-randomize()
 let r = testbls()