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

Rename openpgp api: generateKeyPair --> generateKey

Browse Source
This commit is contained in:
Tankred Hase 2016-02-07 18:01:10 +07:00
parent 735ec3df74
commit f72b4522ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openpgp.js
View File

@ -83,12 +83,12 @@ export function getWorker() {
* { key:Key, privateKeyArmored:String, publicKeyArmored:String } * { key:Key, privateKeyArmored:String, publicKeyArmored:String }
* @static * @static
*/ */
export function generateKeyPair({ userIds=[], passphrase, numBits=2048, unlocked=false } = {}) { export function generateKey({ userIds=[], passphrase, numBits=2048, unlocked=false } = {}) {
userIds = userIds.map(id => id.name + ' <' + id.email + '>'); // format user ids for internal use userIds = userIds.map(id => id.name + ' <' + id.email + '>'); // format user ids for internal use
const options = { userIds, passphrase, numBits, unlocked }; const options = { userIds, passphrase, numBits, unlocked };
if (!util.getWebCrypto() && asyncProxy) { // use web worker if web crypto apis are not supported if (!util.getWebCrypto() && asyncProxy) { // use web worker if web crypto apis are not supported
return asyncProxy.generateKeyPair(options); return asyncProxy.generateKey(options);
} }
return key.generate(options).then(newKey => ({ return key.generate(options).then(newKey => ({
@ -106,7 +106,7 @@ export function generateKeyPair({ userIds=[], passphrase, numBits=2048, unlocked
} }
// fall back to js keygen in a worker // fall back to js keygen in a worker
console.log('Error generating keypair using native WebCrypto... falling back back to js!'); console.log('Error generating keypair using native WebCrypto... falling back back to js!');
return asyncProxy.generateKeyPair(options); return asyncProxy.generateKey(options);
}).catch(onError.bind(null, 'Error generating keypair!')); }).catch(onError.bind(null, 'Error generating keypair!'));
} }