minor fixes for Uint8Array support

Author: timonegk

lib/precondition.js

@@ -1,9 +1,9 @@
 var MAX_ALLOC = Math.pow(2, 30) - 1 // default in iojs
 
 function checkType (variable, name) {
-  // checks whether the type of 'variable' is one of string, Buffer or Uint8Array
-  if (typeof variable !== 'string' && !Buffer.isBuffer(variable) && Object.prototype.toString.call(variable) !== '[object Uint8Array]') {
-    throw new TypeError(name + ' must be a buffer or string')
+  // checks whether the type of 'variable' is one string or Uint8Array (including Buffer)
+  if (typeof variable !== 'string' && Object.prototype.toString.call(variable) !== '[object Uint8Array]') {
+    throw new TypeError(name + ' must be a Buffer, Uint8Array or string')
   }
 }
 

test/fixtures.json

@@ -156,7 +156,7 @@
       }
     },
     {
-      "keyuint8": [112, 97, 115, 115, 119, 111, 114, 100],
+      "keyUint8Array": [112, 97, 115, 115, 119, 111, 114, 100],
       "salt": "salt",
       "iterations": 1,
       "dkLen": 32,
@@ -170,7 +170,7 @@
     },
     {
       "key": "password",
-      "saltuint8": [115, 97, 108, 116],
+      "saltUint8Array": [115, 97, 108, 116],
       "iterations": 1,
       "dkLen": 32,
       "results": {

test/index.js

@@ -124,15 +124,20 @@ function runTests (name, compat) {
   var algos = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'ripemd160']
   algos.forEach(function (algorithm) {
     fixtures.valid.forEach(function (f) {
-      if (f.keyuint8) {
-        var key = new Uint8Array(f.keyuint8)
+      var key, salt
+      if (f.keyUint8Array) {
+        key = new Uint8Array(f.keyuint8)
+      } else if (f.keyHex) {
+        key = Buffer.from(f.keyHex, 'hex')
       } else {
-        var key = f.key || Buffer.from(f.keyHex, 'hex')
+        key = f.key
       }
-      if (f.saltuint8) {
-        var salt = new Uint8Array(f.saltuint8)
+      if (f.saltUint8Array) {
+        salt = new Uint8Array(f.saltuint8)
+      } else if (f.saltHex) {
+        salt = Buffer.from(f.saltHex, 'hex')
       } else {
-        var salt = f.salt || Buffer.from(f.saltHex, 'hex')
+        salt = f.salt
       }
       var expected = f.results[algorithm]
       var description = algorithm + ' encodes ' + key + ' (' + f.salt + ') with ' + algorithm + ' to ' + expected