Merge branch 'cleanup'

dchest · Dec 22, 2014 · 416b1de · 416b1de
2 parents 6964ee2 + 1cd3cf3
commit 416b1de
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/nacl-fast.js b/nacl-fast.js
@@ -2155,6 +2155,10 @@ function checkArrayTypes() {
   }
 }
 
+function cleanup(arr) {
+  for (var i = 0; i < arr.length; i++) arr[i] = 0;
+}
+
 nacl.util = {};
 
 nacl.util.decodeUTF8 = function(s) {
@@ -2397,6 +2401,7 @@ nacl.setPRNG = function(fn) {
         var i, v = new Uint8Array(n);
         crypto.getRandomValues(v);
         for (i = 0; i < n; i++) x[i] = v[i];
+        cleanup(v);
       });
     }
   } else if (typeof require !== 'undefined') {
@@ -2406,6 +2411,7 @@ nacl.setPRNG = function(fn) {
       nacl.setPRNG(function(x, n) {
         var i, v = crypto.randomBytes(n);
         for (i = 0; i < n; i++) x[i] = v[i];
+        cleanup(v);
       });
     }
   }

diff --git a/nacl-fast.min.js b/nacl-fast.min.js
diff --git a/nacl.js b/nacl.js
@@ -942,6 +942,10 @@ function checkArrayTypes() {
   }
 }
 
+function cleanup(arr) {
+  for (var i = 0; i < arr.length; i++) arr[i] = 0;
+}
+
 nacl.util = {};
 
 nacl.util.decodeUTF8 = function(s) {
@@ -1184,6 +1188,7 @@ nacl.setPRNG = function(fn) {
         var i, v = new Uint8Array(n);
         crypto.getRandomValues(v);
         for (i = 0; i < n; i++) x[i] = v[i];
+        cleanup(v);
       });
     }
   } else if (typeof require !== 'undefined') {
@@ -1193,6 +1198,7 @@ nacl.setPRNG = function(fn) {
       nacl.setPRNG(function(x, n) {
         var i, v = crypto.randomBytes(n);
         for (i = 0; i < n; i++) x[i] = v[i];
+        cleanup(v);
       });
     }
   }