From a225027a6bbc0317d1c7e37facda19aba14eb0b9 Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Wed, 23 Mar 2016 13:42:46 +0800
Subject: [PATCH] Wrap message.sign into a promise in openpgp.encrypt

---
 src/openpgp.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/openpgp.js b/src/openpgp.js
index 6cf458dd..d5c00587 100644
--- a/src/openpgp.js
+++ b/src/openpgp.js
@@ -173,12 +173,14 @@ export function encrypt({ data, publicKeys, privateKeys, passwords, filename, ar
     return asyncProxy.delegate('encrypt', { data, publicKeys, privateKeys, passwords, filename, armor });
   }
 
-  let message = createMessage(data, filename);
-  if (privateKeys) { // sign the message only if private keys are specified
-    message = message.sign(privateKeys);
-  }
+  return new Promise(resolve => {
+    let message = createMessage(data, filename);
+    if (privateKeys) { // sign the message only if private keys are specified
+      message = message.sign(privateKeys);
+    }
+    resolve(message);
 
-  return message.encrypt(publicKeys, passwords).then(message => {
+  }).then(message => message.encrypt(publicKeys, passwords)).then(message => {
 
     if(armor) {
       return {