From ac7329fcfaf9d2dd18e79829753cc20288e0beed Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Mon, 16 Sep 2013 14:53:48 +0200
Subject: [PATCH] integrate crypto lib update

---
 src/js/crypto/crypto-batch.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/js/crypto/crypto-batch.js b/src/js/crypto/crypto-batch.js
index 05342af..77f4edb 100644
--- a/src/js/crypto/crypto-batch.js
+++ b/src/js/crypto/crypto-batch.js
@@ -30,12 +30,12 @@
             throw new Error('Arguments missing!');
         }
 
-        // encrypt a list of items
-        self.encryptList(list);
-
         // set sender private key
         self._rsa.init(null, senderPrivkey.privateKey);
 
+        // encrypt a list of items
+        self.encryptList(list);
+
         list.forEach(function(i) {
             // fetch correct public key for encryption
             receiverPk = null;
@@ -71,7 +71,7 @@
         // set sender's keypair id for later verification
         i.senderPk = senderKeyId;
         // sign the bundle
-        i.signature = self._rsa.sign([i.iv, i.ciphertext]);
+        i.signature = self._rsa.sign([i.iv, i.key, i.ciphertext]);
 
         // delete plaintext values
         delete i.key;
@@ -155,13 +155,14 @@
         // set rsa public key used to verify
         self._rsa.init(senderPubkey);
 
-        // verify signature
-        if (!self._rsa.verify([i.iv, i.ciphertext], i.signature)) {
-            throw new Error('Verifying RSA signature failed!');
-        }
         // decrypt symmetric item key for user
         i.key = self._rsa.decrypt(i.encryptedKey);
 
+        // verify signature
+        if (!self._rsa.verify([i.iv, i.key, i.ciphertext], i.signature)) {
+            throw new Error('Verifying RSA signature failed!');
+        }
+
         // delete ciphertext values
         delete i.signature;
         delete i.encryptedKey;