From e3b6903eb14c74291f23c784250354c432e74dea Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Mon, 20 Oct 2014 16:10:09 +0200
Subject: [PATCH] Use global error catch
---
package.json | 4 ++--
src/openpgp.js | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index feaf8b2e..58931e25 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "openpgp",
"description": "OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.",
- "version": "0.8.0-dev",
+ "version": "0.8.0",
"homepage": "http://openpgpjs.org/",
"engines": {
"node": ">=0.8"
@@ -53,4 +53,4 @@
"type": "git",
"url": "https://github.com/openpgpjs/openpgpjs"
}
-}
+}
\ No newline at end of file
diff --git a/src/openpgp.js b/src/openpgp.js
index f37f3ad8..53cce362 100644
--- a/src/openpgp.js
+++ b/src/openpgp.js
@@ -79,7 +79,7 @@ function encryptMessage(keys, text) {
armored = armor.encode(enums.armor.message, msg.packets.write());
return armored;
- }).catch(onError.bind(null, 'Error encrypting message!'));
+ }, 'Error encrypting message!');
}
/**
@@ -107,7 +107,7 @@ function signAndEncryptMessage(publicKeys, privateKey, text) {
armored = armor.encode(enums.armor.message, msg.packets.write());
return armored;
- }).catch(onError.bind(null, 'Error signing and encrypting message!'));
+ }, 'Error signing and encrypting message!');
}
/**
@@ -127,7 +127,7 @@ function decryptMessage(privateKey, msg) {
msg = msg.decrypt(privateKey);
return msg.getText();
- }).catch(onError.bind(null, 'Error decrypting message!'));
+ }, 'Error decrypting message!');
}
/**
@@ -159,7 +159,7 @@ function decryptAndVerifyMessage(privateKey, publicKeys, msg) {
}
return null;
- }).catch(onError.bind(null, 'Error decrypting and verifying message!'));
+ }, 'Error decrypting and verifying message!');
}
/**
@@ -183,7 +183,7 @@ function signClearMessage(privateKeys, text) {
cleartextMessage.sign(privateKeys);
return cleartextMessage.armor();
- }).catch(onError.bind(null, 'Error signing cleartext message!'));
+ }, 'Error signing cleartext message!');
}
/**
@@ -212,7 +212,7 @@ function verifyClearSignedMessage(publicKeys, msg) {
result.signatures = msg.verify(publicKeys);
return result;
- }).catch(onError.bind(null, 'Error verifying cleartext signed message!'));
+ }, 'Error verifying cleartext signed message!');
}
/**
@@ -240,7 +240,7 @@ function generateKeyPair(options) {
result.publicKeyArmored = newKey.toPublic().armor();
return result;
- }).catch(onError.bind(null, 'Error generating keypair!'));
+ }, 'Error generating keypair!');
}
//
@@ -303,4 +303,4 @@ exports.decryptMessage = decryptMessage;
exports.decryptAndVerifyMessage = decryptAndVerifyMessage;
exports.signClearMessage = signClearMessage;
exports.verifyClearSignedMessage = verifyClearSignedMessage;
-exports.generateKeyPair = generateKeyPair;
+exports.generateKeyPair = generateKeyPair;
\ No newline at end of file