fix key and iv decoding

Author: calvinmetcalf

index.js

@@ -25,10 +25,16 @@ function DES (opts) {
     type = 'encrypt'
   }
   var key = opts.key
+  if (!Buffer.isBuffer(key)) {
+    key = Buffer.from(key)
+  }
   if (modeName === 'des-ede' || modeName === 'des-ede-cbc') {
     key = Buffer.concat([key, key.slice(0, 8)])
   }
   var iv = opts.iv
+  if (!Buffer.isBuffer(iv)) {
+    iv = Buffer.from(iv)
+  }
   this._des = mode.create({
     key: key,
     iv: iv,

test.js

@@ -43,6 +43,39 @@ Object.keys(modes).forEach(function (mode) {
         var plainText = Buffer.concat([ourDecrypt.update(ourCipherText), ourDecrypt.final()])
         t.equals(text.toString('hex'), plainText.toString('hex'))
       })
+      t.test('run text: ' + i, function (t) {
+        t.plan(2)
+        var key = crypto.randomBytes(32).toString('base64').slice(0, modes[mode].key)
+        var iv = crypto.randomBytes(32).toString('base64').slice(0, modes[mode].iv)
+        var text = crypto.randomBytes(200)
+        var ourEncrypt
+        try {
+          ourEncrypt = new DES({
+            mode: mode,
+            key: key,
+            iv: iv
+          })
+        } catch (e) {
+          t.notOk(e, e.stack)
+        }
+        var nodeEncrypt
+        try {
+          nodeEncrypt = crypto.createCipheriv(mode, key, iv)
+        } catch (e) {
+          t.notOk(e, e.stack)
+        }
+        var ourCipherText = Buffer.concat([ourEncrypt.update(text), ourEncrypt.final()])
+        var nodeCipherText = Buffer.concat([nodeEncrypt.update(text), nodeEncrypt.final()])
+        t.equals(nodeCipherText.toString('hex'), ourCipherText.toString('hex'))
+        var ourDecrypt = new DES({
+          mode: mode,
+          key: key,
+          iv: iv,
+          decrypt: true
+        })
+        var plainText = Buffer.concat([ourDecrypt.update(ourCipherText), ourDecrypt.final()])
+        t.equals(text.toString('hex'), plainText.toString('hex'))
+      })
     }
   })
 })