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

Throw when signature packet does not correspond to one pass signature packet

Browse Source
This commit is contained in:
Daniel Huigens 2018-10-29 11:45:37 +01:00
parent 9c82bf491e
commit d442b6bad7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/packet/one_pass_signature.js
View File

@ -85,13 +85,13 @@ OnePassSignature.prototype.read = function (bytes) {
// A one-octet signature type. Signature types are described in // A one-octet signature type. Signature types are described in
// Section 5.2.1. // Section 5.2.1.
this.signatureType = enums.read(enums.signature, bytes[mypos++]); this.signatureType = bytes[mypos++];
// A one-octet number describing the hash algorithm used. // A one-octet number describing the hash algorithm used.
this.hashAlgorithm = enums.read(enums.hash, bytes[mypos++]); this.hashAlgorithm = bytes[mypos++];
// A one-octet number describing the public-key algorithm used. // A one-octet number describing the public-key algorithm used.
this.publicKeyAlgorithm = enums.read(enums.publicKey, bytes[mypos++]); this.publicKeyAlgorithm = bytes[mypos++];
// An eight-octet number holding the Key ID of the signing key. // An eight-octet number holding the Key ID of the signing key.
this.issuerKeyId = new type_keyid(); this.issuerKeyId = new type_keyid();
@ -145,6 +145,14 @@ OnePassSignature.prototype.verify = async function() {
if (!correspondingSig || correspondingSig.tag !== enums.packet.signature) { if (!correspondingSig || correspondingSig.tag !== enums.packet.signature) {
throw new Error('Corresponding signature packet missing'); throw new Error('Corresponding signature packet missing');
} }
if (
correspondingSig.signatureType !== this.signatureType ||
correspondingSig.hashAlgorithm !== this.hashAlgorithm ||
correspondingSig.publicKeyAlgorithm !== this.publicKeyAlgorithm ||
!correspondingSig.issuerKeyId.equals(this.issuerKeyId)
) {
throw new Error('Corresponding signature packet does not match one-pass signature packet');
}
correspondingSig.hashed = this.hashed; correspondingSig.hashed = this.hashed;
return correspondingSig.verify.apply(correspondingSig, arguments); return correspondingSig.verify.apply(correspondingSig, arguments);
}; };