Upgrade to next sodium

bigint.js

@@ -4,7 +4,7 @@ var assert = require('nanoassert')
 var sodium = require('sodium-universal')
 
 module.exports = function (limit) {
-  assert.ok(limit > 0n,  'limit must be larger than 0')
+  assert.ok(limit > 0n, 'limit must be larger than 0')
   for (var width = 0n, n = limit; n > 0n; width++) {
     n >>= 64n
   }
@@ -15,11 +15,11 @@ module.exports = function (limit) {
 
   var min = max - (max % limit)
 
-  var n = 0n
+  var sample = 0n
   do {
     sodium.randombytes_buf(buf)
-    n = buf.reduce((s, n) => s << 64n | n, 0n)
-  } while (n >= min)
+    sample = buf.reduce((s, n) => s << 64n | n, 0n)
+  } while (sample >= min)
 
-  return n % limit
+  return sample % limit
 }

index.js

@@ -7,7 +7,7 @@ var buf = new Uint8Array(7)
 var MAX = Number.MAX_SAFE_INTEGER
 module.exports = function secureRandom (limit) {
   assert.ok(Number.isInteger(limit), 'limit must be integer')
-  assert.ok(limit > 0,  'limit must be larger than 0')
+  assert.ok(limit > 0, 'limit must be larger than 0')
   assert.ok(limit <= MAX, 'limit must be at most 2^53 - 1')
 
   // Edge cases:
@@ -19,8 +19,8 @@ module.exports = function secureRandom (limit) {
   do {
     sodium.randombytes_buf(buf)
     // Returns number in [0, 2^53)
-    n = ((((buf[6] & 0b00011111) << 16) | (buf[5] << 8) | (buf[4])) >>> 0) * 0x100000000 // 21 bits, shifted left 32 bits
-              + (((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | (buf[0])) >>> 0) // 32 bits
+    n = ((((buf[6] & 0b00011111) << 16) | (buf[5] << 8) | (buf[4])) >>> 0) * 0x100000000 + // 21 bits, shifted left 32 bits
+      (((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | (buf[0])) >>> 0) // 32 bits
   } while (n >= min)
 
   return n % limit

statistic-test.js

@@ -13,7 +13,7 @@ while (true) {
   var s = template.slice()
   var r = template.slice()
 
-  for (var i = 0; i < 1e7; i++) {
+  for (i = 0; i < 1e7; i++) {
     r[rand(len)]++
     s[sodium.randombytes_uniform(len)]++
   }

test.js

@@ -0,0 +1,5 @@
+const rand = require('.')
+
+for (var i = 0; i < 1e6; i++) {
+  console.log(rand(2971215073))
+}

verify-readle.js

@@ -1,10 +1,10 @@
-var sodium = require('sodium-universal')
+var sodium = require('sodium-native')
 var buf = Buffer.alloc(8).fill(0xff)
 
-var max = ((((buf[6] & 0b00011111) << 16) | (buf[5] << 8) | (buf[4])) >>> 0) * 0x100000000 // 21 bits, shifted left 32 bits
-          + (((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | (buf[0])) >>> 0) // 32 bits
+var max = ((((buf[6] & 0b00011111) << 16) | (buf[5] << 8) | (buf[4])) >>> 0) * 0x100000000 + // 21 bits, shifted left 32 bits
+          (((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | (buf[0])) >>> 0) // 32 bits
 
-if(max !== Number.MAX_SAFE_INTEGER) {
+if (max !== Number.MAX_SAFE_INTEGER) {
   console.log('0b' + max.toString(2), max)
   console.log('0b' + Number.MAX_SAFE_INTEGER.toString(2), Number.MAX_SAFE_INTEGER)
   process.exit(1)
@@ -14,10 +14,10 @@ var a, b
 while (true) {
   sodium.randombytes_buf(buf)
   b = buf.readUIntLE(0, 6)
-  a =   (((buf[5] << 8) | (buf[4])) >>> 0) * 0x100000000
-      + (((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | (buf[0])) >>> 0)
+  a = (((buf[5] << 8) | (buf[4])) >>> 0) * 0x100000000 +
+      (((buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | (buf[0])) >>> 0)
 
-  if(a !== b) {
+  if (a !== b) {
     console.log('0x' + a.toString(16), a)
     console.log('0x' + b.toString(16), b)
     process.exit(1)