Add back zlib and zip to preferred compression algos on key generation

To signal support, despite "no compression" being preferred by default, for security reasons.
ProtonMail · Dec 8, 2023 · 91d2786 · 91d2786
1 parent 8e17486
commit 91d2786
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/key/factory.js b/src/key/factory.js
@@ -222,7 +222,9 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options, conf
       enums.hash.sha512
     ], config.preferredHashAlgorithm);
     signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([
-      enums.compression.uncompressed
+      enums.compression.uncompressed,
+      enums.compression.zlib,
+      enums.compression.zip
     ], config.preferredCompressionAlgorithm);
     // integrity protection always enabled
     signatureProperties.features = [0];

diff --git a/test/general/key.js b/test/general/key.js
@@ -2264,7 +2264,7 @@ function versionSpecificTests() {
       const hash = openpgp.enums.hash;
       expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512]);
       const compr = openpgp.enums.compression;
-      expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed]);
+      expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed, compr.zlib, compr.zip]);
 
       let expectedFeatures = 0x01; // SEIPDv1
       if (openpgp.config.aeadProtect) {
@@ -2319,7 +2319,7 @@ function versionSpecificTests() {
       const hash = openpgp.enums.hash;
       expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512]);
       const compr = openpgp.enums.compression;
-      expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed]);
+      expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed, compr.zip]);
 
       let expectedFeatures = 0x01; // SEIPDv1
       if (openpgp.config.aeadProtect) {