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

Check signature public key algorithm against issuer key algorithm

Browse Source
This commit is contained in:
Daniel Huigens 2018-12-11 18:11:10 +01:00
parent 3b9676f2e9
commit 8720adcf65
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/packet/public_key.js
View File

@ -62,6 +62,11 @@ function PublicKey(date=new Date()) {
* @type {Date} * @type {Date}
*/ */
this.created = util.normalizeDate(date); this.created = util.normalizeDate(date);
/**
* Public key algorithm.
* @type {String}
*/
this.algorithm = null;
/** /**
* Algorithm specific params * Algorithm specific params
* @type {Array<Object>} * @type {Array<Object>}

3
src/packet/public_key_encrypted_session_key.js
View File

@ -52,7 +52,10 @@ function PublicKeyEncryptedSessionKey() {
this.version = 3; this.version = 3;
this.publicKeyId = new type_keyid(); this.publicKeyId = new type_keyid();
this.publicKeyAlgorithm = null;
this.sessionKey = null; this.sessionKey = null;
this.sessionKeyAlgorithm = null;
/** @type {Array<module:type/mpi>} */ /** @type {Array<module:type/mpi>} */
this.encrypted = []; this.encrypted = [];

4
src/packet/signature.js
View File

@ -666,6 +666,10 @@ Signature.prototype.verify = async function (key, signatureType, data) {
const publicKeyAlgorithm = enums.write(enums.publicKey, this.publicKeyAlgorithm); const publicKeyAlgorithm = enums.write(enums.publicKey, this.publicKeyAlgorithm);
const hashAlgorithm = enums.write(enums.hash, this.hashAlgorithm); const hashAlgorithm = enums.write(enums.hash, this.hashAlgorithm);
if (publicKeyAlgorithm !== enums.write(enums.publicKey, key.algorithm)) {
throw new Error('Public key algorithm used to sign signature does not match issuer key algorithm.');
}
let toHash; let toHash;
let hash; let hash;
if (this.hashed) { if (this.hashed) {