transform a string into secure buffer (encryptionKey)

index.js

@@ -18,9 +18,10 @@ class Crypto {
     return this.randomBytes(sodium.crypto_secretbox_KEYBYTES)
   }
 
-  encryptionKey () {
+  encryptionKey (encryptionKey) {
     var key = sodium.sodium_malloc(sodium.crypto_secretbox_KEYBYTES)
-    sodium.randombytes_buf(key)
+    if (encryptionKey) key.write(encryptionKey)
+    else sodium.randombytes_buf(key)
     return key
   }
 

test/index.test.js

@@ -8,13 +8,13 @@ const crypto = require('../')
 const { cleanup, tmp } = require('./util')
 
 describe('key generation', (context) => {
-  context('generate a master key', (assert, next) => {
+  context('masterKey()', (assert, next) => {
     const masterKey = crypto.masterKey()
     assert.ok(masterKey, 'key generated successfully')
     next()
   })
 
-  context('generate an derived asymmetric keypair', (assert, next) => {
+  context('keyPair()', (assert, next) => {
     const masterKey = crypto.masterKey()
     const keypair = crypto.keyPair(masterKey, 0)
     assert.ok(keypair, 'keys successfully generated')
@@ -23,14 +23,21 @@ describe('key generation', (context) => {
     next()
   })
 
-  context('generate an shared encryption key', (assert, next) => {
+  context('encryptionKey()', (assert, next) => {
     const key = crypto.encryptionKey()
     assert.ok(key, 'Key successfully generated')
-    assert.ok(key instanceof Buffer, 'Symmetric key is a buffer')
+    assert.ok(key instanceof Buffer, 'key is a secure buffer')
     next()
   })
 
-  context('generate an access key', (assert, next) => {
+  context('encryptionKey(key)', (assert, next) => {
+    const key = crypto.encryptionKey(crypto.randomBytes(32).toString('hex'))
+    assert.ok(key, 'Key successfully generated')
+    assert.ok(key instanceof Buffer, 'key is a secure buffer')
+    next()
+  })
+
+  context('accessKey()', (assert, next) => {
     const accessKey = crypto.accessKey()
     assert.ok(accessKey, 'Key successfully generated')
     assert.same(accessKey.length, 64, 'Read key is 64 bytes')
@@ -38,7 +45,7 @@ describe('key generation', (context) => {
     next()
   })
 
-  context('pack an access key', (assert, next) => {
+  context('pack(buffer, buffer)', (assert, next) => {
     const address = crypto.randomBytes(32)
     const encryptionKey = crypto.encryptionKey()
 
@@ -51,7 +58,7 @@ describe('key generation', (context) => {
     next()
   })
 
-  context('pack an access key given as strings', (assert, next) => {
+  context('pack(string, string)', (assert, next) => {
     const address = crypto.randomBytes(32)
     const secretKey = crypto.encryptionKey()
 
@@ -64,7 +71,7 @@ describe('key generation', (context) => {
     next()
   })
 
-  context('unpack an access key', (assert, next) => {
+  context('unpack(buffer)', (assert, next) => {
     const accessKey = crypto.accessKey()
 
     const keys = crypto.unpack(accessKey)
@@ -76,7 +83,7 @@ describe('key generation', (context) => {
     next()
   })
 
-  context('check a key is a valid key', (assert, next) => {
+  context('isKey()', (assert, next) => {
     const accessKey = crypto.accessKey()
     assert.ok(crypto.isKey(accessKey), '64 byte buffer is a valid read/write key')
     assert.ok(crypto.isKey(accessKey.toString('hex')), '64 byte string is a valid read/write key')
@@ -88,7 +95,7 @@ describe('key generation', (context) => {
     next()
   })
 
-  context('unpack an access key given as a string', (assert, next) => {
+  context('unpack(string)', (assert, next) => {
     const accessKey = crypto.accessKey()
 
     const keys = crypto.unpack(accessKey.toString('hex'))