Normalise passphrase in the Vault generator, not inside the crypto API

Author: jcoglan

lib/crypto/node_crypto.js

@@ -8,10 +8,9 @@ module.exports = {
 
   pbkdf2: {
     async digest (password, salt, iterations, size) {
-      let pw = password.normalize('NFKD')
       let fn = promisify(crypto.pbkdf2)
       let bytes = Math.ceil(size / 8)
-      return fn(pw, salt, iterations, bytes, 'sha1')
+      return fn(password, salt, iterations, bytes, 'sha1')
     }
   },
 

lib/crypto/web_crypto.js

@@ -14,7 +14,7 @@ module.exports = {
 
   pbkdf2: {
     async digest (password, salt, iterations, size) {
-      let pw = Buffer.from(password.normalize('NFKD'), 'utf8')
+      let pw = Buffer.from(password, 'utf8')
       pw = await subtle.importKey('raw', pw, 'PBKDF2', false, ['deriveKey'])
 
       salt = Buffer.from(salt, 'utf8')

lib/vault.js

@@ -21,6 +21,7 @@ CHARS.ALL       = CHARS.ALPHANUM.concat(CHARS.SPACE).concat(CHARS.SYMBOL)
 const TYPES = 'LOWER UPPER NUMBER SPACE DASH SYMBOL'.split(' ')
 
 function createHash (key, message, entropy) {
+  key = key.normalize('NFC')
   return crypto.pbkdf2.digest(key, message, 8, entropy || 256)
 }