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

Fix merging multiple subkey binding signatures (#868)

Browse Source
This commit is contained in:
Thomas Oberndörfer 2019-02-28 19:34:46 +01:00 committed by Sanjana Rajan
parent b9abf80d5a
commit b1be7d1202
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/key.js
View File

@ -1183,10 +1183,10 @@ SubKey.prototype.update = async function(subKey, primaryKey) {
} }
for (let i = 0; i < that.bindingSignatures.length; i++) { for (let i = 0; i < that.bindingSignatures.length; i++) {
if (that.bindingSignatures[i].issuerKeyId.equals(srcBindSig.issuerKeyId)) { if (that.bindingSignatures[i].issuerKeyId.equals(srcBindSig.issuerKeyId)) {
if (srcBindSig.created < that.bindingSignatures[i].created) { if (srcBindSig.created > that.bindingSignatures[i].created) {
that.bindingSignatures[i] = srcBindSig; that.bindingSignatures[i] = srcBindSig;
return false;
} }
return false;
} }
} }
return true; return true;

14
test/general/key.js
View File

@ -2413,6 +2413,20 @@ describe('Key', function() {
}); });
}); });
it('update() - merge multiple subkey binding signatures', async function() {
const source = (await openpgp.key.readArmored(multipleBindingSignatures)).keys[0];
const dest = (await openpgp.key.readArmored(multipleBindingSignatures)).keys[0];
// remove last subkey binding signature of destination subkey
dest.subKeys[0].bindingSignatures.length = 1;
expect((await source.subKeys[0].getExpirationTime(source.primaryKey)).toISOString()).to.equal('2015-10-18T07:41:30.000Z');
expect((await dest.subKeys[0].getExpirationTime(dest.primaryKey)).toISOString()).to.equal('2018-09-07T06:03:37.000Z');
return dest.update(source).then(async () => {
expect(dest.subKeys[0].bindingSignatures.length).to.equal(1);
// destination key gets new expiration date from source key which has newer subkey binding signature
expect((await dest.subKeys[0].getExpirationTime(dest.primaryKey)).toISOString()).to.equal('2015-10-18T07:41:30.000Z');
});
});
it('revoke() - primary key', async function() { it('revoke() - primary key', async function() {
const privKey = (await openpgp.key.readArmored(priv_key_arm2)).keys[0]; const privKey = (await openpgp.key.readArmored(priv_key_arm2)).keys[0];
await privKey.decrypt('hello world'); await privKey.decrypt('hello world');