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

Leave unhashed subpackets as-is when re-serializing signatures (#1561)

Browse Source 
When re-serializing a signature packet, don't add Issuer, Issuer
Fingerprint, and Embedded Signature subpackets to the unhashed
subpackets if they weren't already there.

Also, store all unhashed subpackets in `signature.unhashedSubpackets`,
not just the "disallowed" ones.
This commit is contained in:
wussler 2022-08-30 13:46:05 +02:00 committed by GitHub
parent 5e6dd8b1ed
commit 000e1335a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/packet/signature.js
View File

@ -188,6 +188,9 @@ class SignaturePacket {
// Add hashed subpackets // Add hashed subpackets
arr.push(this.writeHashedSubPackets()); arr.push(this.writeHashedSubPackets());
// Set unhashed subpackets for serialization
this.unhashedSubpackets = this.createUnhashedSubPackets();
this.signatureData = util.concat(arr); this.signatureData = util.concat(arr);
const toHash = this.toHash(this.signatureType, data, detached); const toHash = this.toHash(this.signatureType, data, detached);
@ -315,26 +318,36 @@ class SignaturePacket {
} }
/** /**
* Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets * Returns the Issuer, Issuer Fingperprint, and Embedded Signature subpacket bodies
* @returns {Uint8Array} Subpacket data. * @returns {Array<Uint8Array>} Subpackets.
*/ */
writeUnhashedSubPackets() { createUnhashedSubPackets() {
const sub = enums.signatureSubpacket; const sub = enums.signatureSubpacket;
const arr = []; const arr = [];
let bytes; let bytes;
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, this.issuerKeyID.write())); arr.push(writeSubPacketBody(sub.issuer, this.issuerKeyID.write()));
} }
if (this.embeddedSignature !== null) { if (this.embeddedSignature !== null) {
arr.push(writeSubPacket(sub.embeddedSignature, this.embeddedSignature.write())); arr.push(writeSubPacketBody(sub.embeddedSignature, this.embeddedSignature.write()));
} }
if (this.issuerFingerprint !== null) { if (this.issuerFingerprint !== null) {
bytes = [new Uint8Array([this.issuerKeyVersion]), this.issuerFingerprint]; bytes = [new Uint8Array([this.issuerKeyVersion]), this.issuerFingerprint];
bytes = util.concat(bytes); bytes = util.concat(bytes);
arr.push(writeSubPacket(sub.issuerFingerprint, bytes)); arr.push(writeSubPacketBody(sub.issuerFingerprint, bytes));
} }
return arr;
}
/**
* Creates an Uint8Array containing the unhashed subpackets
* @returns {Uint8Array} Subpacket data.
*/
writeUnhashedSubPackets() {
const arr = [];
this.unhashedSubpackets.forEach(data => { this.unhashedSubpackets.forEach(data => {
arr.push(writeSimpleLength(data.length)); arr.push(writeSimpleLength(data.length));
arr.push(data); arr.push(data);
@ -354,9 +367,11 @@ class SignaturePacket {
const critical = bytes[mypos] & 0x80; const critical = bytes[mypos] & 0x80;
const type = bytes[mypos] & 0x7F; const type = bytes[mypos] & 0x7F;
if (!hashed && !allowedUnhashedSubpackets.has(type)) { if (!hashed) {
this.unhashedSubpackets.push(bytes.subarray(mypos, bytes.length)); this.unhashedSubpackets.push(bytes.subarray(mypos, bytes.length));
return; if (!allowedUnhashedSubpackets.has(type)) {
return;
}
} }
mypos++; mypos++;
@ -762,3 +777,19 @@ function writeSubPacket(type, data) {
arr.push(data); arr.push(data);
return util.concat(arr); return util.concat(arr);
} }
/**
* Creates a string representation of the body of a sub-packet (without length)
* @see {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.1|RFC4880 5.2.3.1}
* @see {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.2|RFC4880 5.2.3.2}
* @param {Integer} type - Subpacket signature type.
* @param {String} data - Data to be included
* @returns {Uint8Array} A string-representation of a sub signature packet.
* @private
*/
function writeSubPacketBody(type, data) {
const arr = [];
arr.push(new Uint8Array([type]));
arr.push(data);
return util.concat(arr);
}