From 9de55b49f3339f1ef97c825eee8caed9d41d1be5 Mon Sep 17 00:00:00 2001
From: Artem Chudinov <arzeth0@gmail.com>
Date: Wed, 19 Aug 2015 22:32:06 +0500
Subject: [PATCH] s2k.js,async_proxy.js: Initialize variable `data` properly

It fixes error when running the example code (in Node.js with enforced strict
mode) from README.md:

[ReferenceError: data is not defined]
Error: Error generating keypair using js fallback!
    at /tmp/fff/node_modules/openpgp/src/openpgp.js:266:13
    at process._tickDomainCallback (node.js:399:9)
---
 src/type/s2k.js           | 4 ++--
 src/worker/async_proxy.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/type/s2k.js b/src/type/s2k.js
index bb5fcc77..683d1e16 100644
--- a/src/type/s2k.js
+++ b/src/type/s2k.js
@@ -153,8 +153,8 @@ S2K.prototype.produce_key = function (passphrase, numBytes) {
 
       case 'iterated':
         var isp = [],
-          count = s2k.get_count();
-        data = s2k.salt + passphrase;
+          count = s2k.get_count(),
+          data = s2k.salt + passphrase;
 
         while (isp.length * data.length < count)
           isp.push(data);
diff --git a/src/worker/async_proxy.js b/src/worker/async_proxy.js
index 0e6fdccc..66c36264 100644
--- a/src/worker/async_proxy.js
+++ b/src/worker/async_proxy.js
@@ -333,8 +333,8 @@ AsyncProxy.prototype.decryptKey = function(privateKey, password) {
     });
 
     self.tasks.push({ resolve:function(data) {
-      var packetlist = packet.List.fromStructuredClone(data);
-      data = new key.Key(packetlist);
+      var packetlist = packet.List.fromStructuredClone(data),
+        data = new key.Key(packetlist);
       resolve(data);
     }, reject:reject });
   });
@@ -361,8 +361,8 @@ AsyncProxy.prototype.decryptKeyPacket = function(privateKey, keyIds, password) {
     });
 
     self.tasks.push({ resolve:function(data) {
-      var packetlist = packet.List.fromStructuredClone(data);
-      data = new key.Key(packetlist);
+      var packetlist = packet.List.fromStructuredClone(data),
+        data = new key.Key(packetlist);
       resolve(data);
     }, reject:reject });
   });