Use same signature array structure in verify for ClearSignedMessages as Message
This commit is contained in:
parent
571ed67624
commit
e885fb1433
|
@ -91,18 +91,25 @@ CleartextMessage.prototype.verify = function(keys) {
|
||||||
var literalDataPacket = new packet.Literal();
|
var literalDataPacket = new packet.Literal();
|
||||||
// we assume that cleartext signature is generated based on UTF8 cleartext
|
// we assume that cleartext signature is generated based on UTF8 cleartext
|
||||||
literalDataPacket.setText(this.text);
|
literalDataPacket.setText(this.text);
|
||||||
keys.forEach(function(key) {
|
for (var i = 0; i < signatureList.length; i++) {
|
||||||
for (var i = 0; i < signatureList.length; i++) {
|
var keyPacket = null;
|
||||||
var keyPacket = key.getKeyPacket([signatureList[i].issuerKeyId]);
|
for (var j = 0; j < keys.length; j++) {
|
||||||
|
keyPacket = keys[j].getKeyPacket([signatureList[i].issuerKeyId]);
|
||||||
if (keyPacket) {
|
if (keyPacket) {
|
||||||
var verifiedSig = {};
|
|
||||||
verifiedSig.keyid = signatureList[i].issuerKeyId;
|
|
||||||
verifiedSig.valid = signatureList[i].verify(keyPacket, literalDataPacket);
|
|
||||||
result.push(verifiedSig);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
var verifiedSig = {};
|
||||||
|
if (keyPacket) {
|
||||||
|
verifiedSig.keyid = signatureList[i].issuerKeyId;
|
||||||
|
verifiedSig.valid = signatureList[i].verify(keyPacket, literalDataPacket);
|
||||||
|
} else {
|
||||||
|
verifiedSig.keyid = signatureList[i].issuerKeyId;
|
||||||
|
verifiedSig.valid = null;
|
||||||
|
}
|
||||||
|
result.push(verifiedSig);
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user