Use global error catch

This commit is contained in:
Tankred Hase 2014-10-20 16:10:09 +02:00
parent 39e1e145e4
commit e3b6903eb1
2 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
{ {
"name": "openpgp", "name": "openpgp",
"description": "OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.", "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/", "homepage": "http://openpgpjs.org/",
"engines": { "engines": {
"node": ">=0.8" "node": ">=0.8"

View File

@ -79,7 +79,7 @@ function encryptMessage(keys, text) {
armored = armor.encode(enums.armor.message, msg.packets.write()); armored = armor.encode(enums.armor.message, msg.packets.write());
return armored; 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()); armored = armor.encode(enums.armor.message, msg.packets.write());
return armored; 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); msg = msg.decrypt(privateKey);
return msg.getText(); return msg.getText();
}).catch(onError.bind(null, 'Error decrypting message!')); }, 'Error decrypting message!');
} }
/** /**
@ -159,7 +159,7 @@ function decryptAndVerifyMessage(privateKey, publicKeys, msg) {
} }
return null; 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); cleartextMessage.sign(privateKeys);
return cleartextMessage.armor(); 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); result.signatures = msg.verify(publicKeys);
return result; 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(); result.publicKeyArmored = newKey.toPublic().armor();
return result; return result;
}).catch(onError.bind(null, 'Error generating keypair!')); }, 'Error generating keypair!');
} }
// //