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

Remove no-op revocationCertificate option from reformatKey

Browse Source
This commit is contained in:
Daniel Huigens 2020-02-27 15:51:17 +01:00
parent 60822d87d9
commit e986c47ed5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/openpgp.js
View File

@ -156,21 +156,18 @@ export function generateKey({ userIds = [], passphrase = "", numBits = 2048, rsa
* @param {Array<Object>} userIds array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }] * @param {Array<Object>} userIds array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
* @param {String} passphrase (optional) The passphrase used to encrypt the resulting private key * @param {String} passphrase (optional) The passphrase used to encrypt the resulting private key
* @param {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires * @param {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
* @param {Boolean} revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
* @returns {Promise<Object>} The generated key object in the form: * @returns {Promise<Object>} The generated key object in the form:
* { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String } * { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
* @async * @async
* @static * @static
*/ */
export function reformatKey({ privateKey, userIds = [], passphrase = "", keyExpirationTime = 0, date, revocationCertificate = true }) { export function reformatKey({ privateKey, userIds = [], passphrase = "", keyExpirationTime = 0, date }) {
userIds = toArray(userIds); userIds = toArray(userIds);
const options = { privateKey, userIds, passphrase, keyExpirationTime, date, revocationCertificate }; const options = { privateKey, userIds, passphrase, keyExpirationTime, date };
if (asyncProxy) { if (asyncProxy) {
return asyncProxy.delegate('reformatKey', options); return asyncProxy.delegate('reformatKey', options);
} }
options.revoked = options.revocationCertificate;
return reformat(options).then(async key => { return reformat(options).then(async key => {
const revocationCertificate = await key.getRevocationCertificate(date); const revocationCertificate = await key.getRevocationCertificate(date);
key.revocationSignatures = []; key.revocationSignatures = [];