fix: make keychain pass optional

libp2p · Aug 5, 2020 · 088b782 · 088b782
1 parent 96d72b3
commit 088b782
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/src/keychain/index.js b/src/keychain/index.js
@@ -120,22 +120,14 @@ class Keychain {
       throw new Error(`dek.iterationCount must be least ${NIST.minIterationCount}`)
     }
 
-    // Lazily create the derived encrypting key
-    let dek
-    Object.defineProperty(this, '_', {
-      value: () => {
-        if (!dek) {
-          dek = crypto.pbkdf2(
-            this.opts.passPhrase,
-            this.opts.dek.salt,
-            this.opts.dek.iterationCount,
-            this.opts.dek.keyLength,
-            this.opts.dek.hash)
-        }
-
-        return dek
-      }
-    })
+    const dek = this.opts.passPhrase ? crypto.pbkdf2(
+      this.opts.passPhrase,
+      this.opts.dek.salt,
+      this.opts.dek.iterationCount,
+      this.opts.dek.keyLength,
+      this.opts.dek.hash) : ''
+
+    Object.defineProperty(this, '_', { value: () => dek })
   }
 
   /**

diff --git a/test/keychain/keychain.spec.js b/test/keychain/keychain.spec.js
@@ -60,9 +60,7 @@ describe('keychain', () => {
   })
 
   it('does not support unsupported hashing alorithms', () => {
-    const keychain = new Keychain(datastore2, { passPhrase: passPhrase, dek: { hash: 'my-hash' } })
-
-    expect(keychain.createKey('derp')).to.be.rejected()
+    expect(() => new Keychain(datastore2, { passPhrase: passPhrase, dek: { hash: 'my-hash' } })).to.throw()
   })
 
   it('can list keys without a password', async () => {