From e1b9156e72dcf8de31db95cf356a267f65ed13c5 Mon Sep 17 00:00:00 2001 From: Tom J Date: Fri, 20 Dec 2019 17:20:18 +0100 Subject: [PATCH] Explicitly include 'uncompressed' in preferred compression algos (#1020) --- src/key/factory.js | 3 ++- test/general/key.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/key/factory.js b/src/key/factory.js index 14dcaacb..292c8370 100644 --- a/src/key/factory.js +++ b/src/key/factory.js @@ -198,7 +198,8 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options) { ], config.prefer_hash_algorithm); signaturePacket.preferredCompressionAlgorithms = createdPreferredAlgos([ enums.compression.zlib, - enums.compression.zip + enums.compression.zip, + enums.compression.uncompressed ], config.compression); if (index === 0) { signaturePacket.isPrimaryUserID = true; diff --git a/test/general/key.js b/test/general/key.js index 6884eb7f..18badd00 100644 --- a/test/general/key.js +++ b/test/general/key.js @@ -1679,7 +1679,7 @@ function versionSpecificTests() { const hash = openpgp.enums.hash; expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512, hash.sha1]); const compr = openpgp.enums.compression; - expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zlib, compr.zip]); + expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zlib, compr.zip, compr.uncompressed]); expect(key.users[0].selfCertifications[0].features).to.eql(openpgp.config.v5_keys ? [7] : [1]); }; const opt = {numBits: 512, userIds: 'test ', passphrase: 'hello'}; @@ -1721,7 +1721,7 @@ function versionSpecificTests() { const hash = openpgp.enums.hash; expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha1]); const compr = openpgp.enums.compression; - expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zlib, compr.zip]); + expect(key.users[0].selfCertifications[0].preferredCompressionAlgorithms).to.eql([compr.zlib, compr.zip, compr.uncompressed]); expect(key.users[0].selfCertifications[0].features).to.eql(openpgp.config.v5_keys ? [7] : [1]); }; const opt = {numBits: 512, userIds: 'test ', passphrase: 'hello'};