From 3945912b29ffe36d6739c0bd0a5feb7ed2e16d38 Mon Sep 17 00:00:00 2001 From: Sanjana Rajan Date: Mon, 12 Mar 2018 23:47:17 +0100 Subject: [PATCH] remove some redundant code --- src/key.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/key.js b/src/key.js index 166499cb..45cc55ea 100644 --- a/src/key.js +++ b/src/key.js @@ -278,10 +278,11 @@ Key.prototype.getSigningKeyPacket = async function (keyId=null, date=new Date()) for (let i = 0; i < this.subKeys.length; i++) { if (!keyId || this.subKeys[i].subKey.getKeyId().equals(keyId)) { // eslint-disable-next-line no-await-in-loop - await this.subKeys[i].verify(primaryKey, date); - for (let j = 0; j < this.subKeys[i].bindingSignatures.length; j++) { - if (isValidSigningKeyPacket(this.subKeys[i].subKey, this.subKeys[i].bindingSignatures[j], date)) { - return this.subKeys[i].subKey; + if (await this.subKeys[i].verify(primaryKey, date) === enums.keyStatus.valid) { + for (let j = 0; j < this.subKeys[i].bindingSignatures.length; j++) { + if (isValidSigningKeyPacket(this.subKeys[i].subKey, this.subKeys[i].bindingSignatures[j], date)) { + return this.subKeys[i].subKey; + } } } } @@ -321,10 +322,11 @@ Key.prototype.getEncryptionKeyPacket = async function(keyId, date=new Date()) { for (let i = 0; i < this.subKeys.length; i++) { if (!keyId || this.subKeys[i].subKey.getKeyId().equals(keyId)) { // eslint-disable-next-line no-await-in-loop - await this.subKeys[i].verify(primaryKey, date); - for (let j = 0; j < this.subKeys[i].bindingSignatures.length; j++) { - if (isValidEncryptionKeyPacket(this.subKeys[i].subKey, this.subKeys[i].bindingSignatures[j], date)) { - return this.subKeys[i].subKey; + if (await this.subKeys[i].verify(primaryKey, date) === enums.keyStatus.valid) { + for (let j = 0; j < this.subKeys[i].bindingSignatures.length; j++) { + if (isValidEncryptionKeyPacket(this.subKeys[i].subKey, this.subKeys[i].bindingSignatures[j], date)) { + return this.subKeys[i].subKey; + } } } }