Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2026-03-07 01:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup public api

Browse Source
This commit is contained in:
Tankred Hase
2016-03-23 21:36:48 +08:00
parent 1e3d6468d6
commit ddedb5cb42
2 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openpgp.js
View File

@@ -109,18 +109,7 @@ export function generateKey({ userIds=[], passphrase, numBits=2048, unlocked=fal
privateKeyArmored: newKey.armor(),
publicKeyArmored: newKey.toPublic().armor()
})).catch(err => {
// js fallback already tried
if (config.debug) { console.error(err); }
if (!util.getWebCryptoAll()) {
throw new Error('Error generating keypair using js fallback');
}
// fall back to js keygen in a worker
if (config.debug) { console.log('Error generating keypair using native WebCrypto... falling back back to js'); }
return asyncProxy.delegate('generateKey', options);
}).catch(onError.bind(null, 'Error generating keypair'));
})).catch(onError.bind(null, 'Error generating keypair'));
}
/**
@@ -173,14 +162,15 @@ export function encrypt({ data, publicKeys, privateKeys, passwords, filename, ar
return asyncProxy.delegate('encrypt', { data, publicKeys, privateKeys, passwords, filename, armor });
}
return new Promise(resolve => {
return new Promise(resolve => resolve()).then(() => {
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 => message.encrypt(publicKeys, passwords)).then(message => {
}).then(message => {
if(armor) {
return {