Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-06-07 22:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
To signal support, despite "no compression" being preferred by default,
for security reasons.
This commit is contained in:
larabr 2023-12-08 14:00:22 +01:00
parent e93702bb8d
commit ff4181ad5a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/key/factory.js
View File

@ -221,7 +221,9 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options, conf
enums.hash.sha3_512 enums.hash.sha3_512
], config.preferredHashAlgorithm); ], config.preferredHashAlgorithm);
signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([ signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([
enums.compression.uncompressed enums.compression.uncompressed,
enums.compression.zlib,
enums.compression.zip
], config.preferredCompressionAlgorithm); ], config.preferredCompressionAlgorithm);
// integrity protection always enabled // integrity protection always enabled
signatureProperties.features = [0]; signatureProperties.features = [0];

4
test/general/key.js
View File

@ -2264,7 +2264,7 @@ function versionSpecificTests() {
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512, hash.sha3_256, hash.sha3_512]); expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512, hash.sha3_256, hash.sha3_512]);
const compr = openpgp.enums.compression; 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 let expectedFeatures = 0x01; // SEIPDv1
if (openpgp.config.aeadProtect) { if (openpgp.config.aeadProtect) {
@ -2319,7 +2319,7 @@ function versionSpecificTests() {
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha3_256, hash.sha3_512]); expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha3_256, hash.sha3_512]);
const compr = openpgp.enums.compression; 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 let expectedFeatures = 0x01; // SEIPDv1
if (openpgp.config.aeadProtect) { if (openpgp.config.aeadProtect) {