add support for all ArrayBuffers

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 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')
+  // checks if the variable is a string or a typed array
+  if (typeof variable !== 'string' && !ArrayBuffer.isView(variable)) {
+    throw new TypeError(name + ' must be a string or an ArrayBuffer')
   }
 }
 

test/fixtures.json

@@ -182,6 +182,62 @@
         "sha384": "c0e14f06e49e32d73f9f52ddf1d0c5c7191609233631dadd76a567db42b78676",
         "ripemd160": "b725258b125e0bacb0e2307e34feb16a4d0d6aed6cb4b0eee458fc1829020428"
       }
+    },
+    {
+      "keyInt32Array": [112, 97, 115, 115, 119, 111, 114, 100],
+      "salt": "salt",
+      "iterations": 1,
+      "dkLen": 32,
+      "results": {
+        "sha1": "0c60c80f961f0e71f3a9b524af6012062fe037a6e0f0eb94fe8fc46bdc637164",
+        "sha256": "120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b",
+        "sha512": "867f70cf1ade02cff3752599a3a53dc4af34c7a669815ae5d513554e1c8cf252",
+        "sha224": "3c198cbdb9464b7857966bd05b7bc92bc1cc4e6e63155d4e490557fd85989497",
+        "sha384": "c0e14f06e49e32d73f9f52ddf1d0c5c7191609233631dadd76a567db42b78676",
+        "ripemd160": "b725258b125e0bacb0e2307e34feb16a4d0d6aed6cb4b0eee458fc1829020428"
+      }
+    },
+    {
+      "key": "password",
+      "saltInt32Array": [115, 97, 108, 116],
+      "iterations": 1,
+      "dkLen": 32,
+      "results": {
+        "sha1": "0c60c80f961f0e71f3a9b524af6012062fe037a6e0f0eb94fe8fc46bdc637164",
+        "sha256": "120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b",
+        "sha512": "867f70cf1ade02cff3752599a3a53dc4af34c7a669815ae5d513554e1c8cf252",
+        "sha224": "3c198cbdb9464b7857966bd05b7bc92bc1cc4e6e63155d4e490557fd85989497",
+        "sha384": "c0e14f06e49e32d73f9f52ddf1d0c5c7191609233631dadd76a567db42b78676",
+        "ripemd160": "b725258b125e0bacb0e2307e34feb16a4d0d6aed6cb4b0eee458fc1829020428"
+      }
+    },
+    {
+      "keyFloat64Array": [112, 97, 115, 115, 119, 111, 114, 100],
+      "salt": "salt",
+      "iterations": 1,
+      "dkLen": 32,
+      "results": {
+        "sha1": "0c60c80f961f0e71f3a9b524af6012062fe037a6e0f0eb94fe8fc46bdc637164",
+        "sha256": "120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b",
+        "sha512": "867f70cf1ade02cff3752599a3a53dc4af34c7a669815ae5d513554e1c8cf252",
+        "sha224": "3c198cbdb9464b7857966bd05b7bc92bc1cc4e6e63155d4e490557fd85989497",
+        "sha384": "c0e14f06e49e32d73f9f52ddf1d0c5c7191609233631dadd76a567db42b78676",
+        "ripemd160": "b725258b125e0bacb0e2307e34feb16a4d0d6aed6cb4b0eee458fc1829020428"
+      }
+    },
+    {
+      "key": "password",
+      "saltFloat64Array": [115, 97, 108, 116],
+      "iterations": 1,
+      "dkLen": 32,
+      "results": {
+        "sha1": "0c60c80f961f0e71f3a9b524af6012062fe037a6e0f0eb94fe8fc46bdc637164",
+        "sha256": "120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be17b",
+        "sha512": "867f70cf1ade02cff3752599a3a53dc4af34c7a669815ae5d513554e1c8cf252",
+        "sha224": "3c198cbdb9464b7857966bd05b7bc92bc1cc4e6e63155d4e490557fd85989497",
+        "sha384": "c0e14f06e49e32d73f9f52ddf1d0c5c7191609233631dadd76a567db42b78676",
+        "ripemd160": "b725258b125e0bacb0e2307e34feb16a4d0d6aed6cb4b0eee458fc1829020428"
+      }
     }
   ],
   "invalid": [

test/index.js

@@ -97,50 +97,68 @@ function runTests (name, compat) {
     }, /No callback provided to pbkdf2/)
   })
 
-  tape(name + ' should throw if the password is not a buffer or string or Uint8Array', function (t) {
+  tape(name + ' should throw if the password is not a string or an ArrayBuffer', function (t) {
     t.plan(2)
 
     t.throws(function () {
       compat.pbkdf2(['a'], 'salt', 1, 32, 'sha1', function () {})
-    }, /Password must be a Buffer, Uint8Array or string/)
+    }, /Password must be a string or an ArrayBuffer/)
 
     t.throws(function () {
       compat.pbkdf2Sync(['a'], 'salt', 1, 32, 'sha1')
-    }, /Password must be a Buffer, Uint8Array or string/)
+    }, /Password must be a string or an ArrayBuffer/)
   })
 
-  tape(name + ' should throw if the salt is not a buffer or string or Uint8Array', function (t) {
+  tape(name + ' should throw if the salt is not a string or an ArrayBuffer', function (t) {
     t.plan(2)
 
     t.throws(function () {
       compat.pbkdf2('pass', ['salt'], 1, 32, 'sha1')
-    }, /Salt must be a Buffer, Uint8Array or string/)
+    }, /Salt must be a string or an ArrayBuffer/)
 
     t.throws(function () {
       compat.pbkdf2Sync('pass', ['salt'], 1, 32, 'sha1')
-    }, /Salt must be a Buffer, Uint8Array or string/)
+    }, /Salt must be a string or an ArrayBuffer/)
   })
 
   var algos = ['sha1', 'sha224', 'sha256', 'sha384', 'sha512', 'ripemd160']
   algos.forEach(function (algorithm) {
     fixtures.valid.forEach(function (f) {
-      var key, salt
+      var key, keyType, salt, saltType
       if (f.keyUint8Array) {
         key = new Uint8Array(f.keyUint8Array)
+        keyType = 'Uint8Array'
+      } else if (f.keyInt32Array) {
+        key = new Int32Array(f.keyInt32Array)
+        keyType = 'Int32Array'
+      } else if (f.keyFloat64Array) {
+        key = new Float64Array(f.keyFloat64Array)
+        keyType = 'Float64Array'
       } else if (f.keyHex) {
         key = Buffer.from(f.keyHex, 'hex')
+        keyType = 'hex'
       } else {
         key = f.key
+        keyType = 'string'
       }
       if (f.saltUint8Array) {
         salt = new Uint8Array(f.saltUint8Array)
+        saltType = 'Uint8Array'
+      } else if (f.saltInt32Array) {
+        salt = new Int32Array(f.saltInt32Array)
+        saltType = 'Int32Array'
+      } else if (f.saltFloat64Array) {
+        salt = new Float64Array(f.saltFloat64Array)
+        saltType = 'Float64Array'
       } else if (f.saltHex) {
         salt = Buffer.from(f.saltHex, 'hex')
+        saltType = 'hex'
       } else {
         salt = f.salt
+        saltType = 'string'
       }
       var expected = f.results[algorithm]
-      var description = algorithm + ' encodes ' + key + ' (' + f.salt + ') with ' + algorithm + ' to ' + expected
+      var description = algorithm + ' encodes "' + key + '" (' + keyType + ') with salt "' + salt + '" (' + saltType + ') with ' + algorithm + ' to ' + expected
 
       tape(name + ' async w/ ' + description, function (t) {
         t.plan(2)