fix encodings

Author: calvinmetcalf

lib/async.js

@@ -1,6 +1,7 @@
 var checkParameters = require('./precondition')
 var defaultEncoding = require('./default-encoding')
 var sync = require('./sync')
+var toBuffer = require('./to-buffer')
 var Buffer = require('safe-buffer').Buffer
 
 var ZERO_BUF
@@ -89,8 +90,8 @@ module.exports = function (password, salt, iterations, keylen, digest, callback)
 
   checkParameters(password, salt, iterations, keylen)
   if (typeof callback !== 'function') throw new Error('No callback provided to pbkdf2')
-  if (!Buffer.isBuffer(password)) password = Buffer.from(password, defaultEncoding)
-  if (!Buffer.isBuffer(salt)) salt = Buffer.from(salt, defaultEncoding)
+  password = toBuffer(password, defaultEncoding)
+  salt = toBuffer(salt, defaultEncoding)
 
   resolvePromise(checkNative(algo).then(function (resp) {
     if (resp) return browserPbkdf2(password, salt, iterations, keylen, algo)

lib/sync-browser.js

@@ -1,6 +1,7 @@
 var md5 = require('create-hash/md5')
 var RIPEMD160 = require('ripemd160')
 var sha = require('sha.js')
+var toBuffer = require('./to-buffer')
 
 var checkParameters = require('./precondition')
 var defaultEncoding = require('./default-encoding')
@@ -68,8 +69,8 @@ function getDigest (alg) {
 function pbkdf2 (password, salt, iterations, keylen, digest) {
   checkParameters(password, salt, iterations, keylen)
 
-  if (!Buffer.isBuffer(password)) password = Buffer.from(password, defaultEncoding)
-  if (!Buffer.isBuffer(salt)) salt = Buffer.from(salt, defaultEncoding)
+  password = toBuffer(password, defaultEncoding)
+  salt = toBuffer(salt, defaultEncoding)
 
   digest = digest || 'sha1'
 

lib/sync.js

@@ -13,12 +13,13 @@ var createHmac = require('create-hmac')
 var checkParameters = require('../lib/precondition')
 var defaultEncoding = require('../lib/default-encoding')
 var Buffer = require('safe-buffer').Buffer
+var toBuffer = require('./to-buffer')
 
 function pbkdf2 (password, salt, iterations, keylen, digest) {
   checkParameters(password, salt, iterations, keylen)
 
-  if (!Buffer.isBuffer(password)) password = Buffer.from(password, defaultEncoding)
-  if (!Buffer.isBuffer(salt)) salt = Buffer.from(salt, defaultEncoding)
+  password = toBuffer(password, defaultEncoding)
+  salt = toBuffer(salt, defaultEncoding)
 
   digest = digest || 'sha1'
 

lib/to-buffer.js

@@ -0,0 +1,13 @@
+var Buffer = require('safe-buffer').Buffer
+
+module.exports = (thing, encoding) => {
+  if (Buffer.isBuffer(thing)) {
+    return thing
+  }
+  if (typeof thing === 'string') {
+    return Buffer.from(thing, encoding)
+  }
+  if (ArrayBuffer.isView(thing)) {
+    return Buffer.from(thing.buffer)
+  }
+}