suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fall back to js crypto in case native RSA keygen fails

Browse Source
This commit is contained in:
Tankred Hase 2014-10-29 18:17:03 +01:00
parent d38fc07578
commit eedb722d7b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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.1",
"version": "0.8.2",
"homepage": "http://openpgpjs.org/",
"engines": {
"node": ">=0.8"

14
src/openpgp.js
View File

@ -240,7 +240,19 @@ function generateKeyPair(options) {
result.publicKeyArmored = newKey.toPublic().armor();
return result;
}, 'Error generating keypair!');
}).catch(function(err) {
console.error(err);
if (!util.getWebCrypto()) {
// js fallback already tried
throw new Error('Error generating keypair using js fallback!');
}
// fall back to js keygen in a worker
console.log('Error generating keypair using native WebCrypto... falling back back to js!');
return asyncProxy.generateKeyPair(options);
}).catch(onError.bind(null, 'Error generating keypair!'));
}
//