Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-10-14 00:59:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename enums.signatureSubpacket.issuer to .issuerKeyID

Browse Source 
To reflect the subpacket rename in the crypto-refresh.
This commit is contained in:
larabr 2023-08-31 16:00:11 +02:00
parent 71ac6aff2f
commit 091be036f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/enums.js
View File

@ -378,7 +378,7 @@ export default {
placeholderBackwardsCompatibility: 10, placeholderBackwardsCompatibility: 10,
preferredSymmetricAlgorithms: 11, preferredSymmetricAlgorithms: 11,
revocationKey: 12, revocationKey: 12,
issuer: 16, issuerKeyID: 16,
notationData: 20, notationData: 20,
preferredHashAlgorithms: 21, preferredHashAlgorithms: 21,
preferredCompressionAlgorithms: 22, preferredCompressionAlgorithms: 22,

6
src/packet/signature.js
View File

@ -30,7 +30,7 @@ const verified = Symbol('verified');
// Tampering with those invalidates the signature, so we still trust them and parse them. // Tampering with those invalidates the signature, so we still trust them and parse them.
// All other unhashed subpackets are ignored. // All other unhashed subpackets are ignored.
const allowedUnhashedSubpackets = new Set([ const allowedUnhashedSubpackets = new Set([
enums.signatureSubpacket.issuer, enums.signatureSubpacket.issuerKeyID,
enums.signatureSubpacket.issuerFingerprint, enums.signatureSubpacket.issuerFingerprint,
enums.signatureSubpacket.embeddedSignature enums.signatureSubpacket.embeddedSignature
]); ]);
@ -278,7 +278,7 @@ class SignaturePacket {
if (!this.issuerKeyID.isNull() && this.issuerKeyVersion < 5) { if (!this.issuerKeyID.isNull() && this.issuerKeyVersion < 5) {
// If the version of [the] key is greater than 4, this subpacket // If the version of [the] key is greater than 4, this subpacket
// MUST NOT be included in the signature. // MUST NOT be included in the signature.
arr.push(writeSubPacket(sub.issuer, true, this.issuerKeyID.write())); arr.push(writeSubPacket(sub.issuerKeyID, true, this.issuerKeyID.write()));
} }
this.rawNotations.forEach(({ name, value, humanReadable, critical }) => { this.rawNotations.forEach(({ name, value, humanReadable, critical }) => {
bytes = [new Uint8Array([humanReadable ? 0x80 : 0, 0, 0, 0])]; bytes = [new Uint8Array([humanReadable ? 0x80 : 0, 0, 0, 0])];
@ -442,7 +442,7 @@ class SignaturePacket {
this.revocationKeyFingerprint = bytes.subarray(mypos, mypos + 20); this.revocationKeyFingerprint = bytes.subarray(mypos, mypos + 20);
break; break;
case enums.signatureSubpacket.issuer: case enums.signatureSubpacket.issuerKeyID:
// Issuer // Issuer
if (this.version === 4) { if (this.version === 4) {
this.issuerKeyID.read(bytes.subarray(mypos, bytes.length)); this.issuerKeyID.read(bytes.subarray(mypos, bytes.length));