From a6e74666c88971f526e3c235f660daf7dd87f986 Mon Sep 17 00:00:00 2001
From: "Ryan X. Charles" <ryan@bitpay.com>
Date: Mon, 25 Aug 2014 20:38:39 -0700
Subject: [PATCH] decrypt blocks

---
 lib/expmt/cbc.js |  2 +-
 test/test.cbc.js | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/expmt/cbc.js b/lib/expmt/cbc.js
index eb24603..c7224c1 100644
--- a/lib/expmt/cbc.js
+++ b/lib/expmt/cbc.js
@@ -74,7 +74,7 @@ CBC.decryptblocks = function(encbufs, ivbuf, blockcipher, cipherkeybuf) {
     ivbuf = encbuf;
   }
 
-  return encbufs;
+  return blockbufs;
 };
 
 CBC.pkcs7pad = function(buf, blocksize) {
diff --git a/test/test.cbc.js b/test/test.cbc.js
index 0f56d57..dcd033e 100644
--- a/test/test.cbc.js
+++ b/test/test.cbc.js
@@ -135,6 +135,32 @@ describe('CBC', function() {
 
   });
   
+  describe('@decryptblocks', function() {
+
+    it('should decrypt encrypted blocks', function() {
+      var messagebuf1 = new Buffer(128 / 8);
+      messagebuf1.fill(0);
+      var messagebuf2 = new Buffer(128 / 8);
+      messagebuf2.fill(0x10);
+      var ivbuf = new Buffer(128 / 8);
+      ivbuf.fill(0x10);
+      var cipherkeybuf = new Buffer(128 / 8);
+      cipherkeybuf.fill(0);
+      var blockcipher = {}
+      blockcipher.encrypt = function(messagebuf, cipherkeybuf) {
+        return messagebuf;
+      };
+      blockcipher.decrypt = function(messagebuf, cipherkeybuf) {
+        return messagebuf;
+      };
+      var encbufs = CBC.encryptblocks([messagebuf1, messagebuf2], ivbuf, blockcipher, cipherkeybuf);
+      var bufs = CBC.decryptblocks(encbufs, ivbuf, blockcipher, cipherkeybuf);
+      bufs[0].toString('hex').should.equal(messagebuf1.toString('hex'));
+      bufs[1].toString('hex').should.equal(messagebuf2.toString('hex'));
+    });
+
+  });
+  
   describe('@pkcs7pad', function() {
     
     it('should pad this 32 bit buffer to 128 bits with the number 128/8 - 32/8', function() {