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

Explicitly include 'uncompressed' in preferred compression algos ()

Browse Source
This commit is contained in:
Tom J 2019-12-20 17:20:18 +01:00 committed by Daniel Huigens
parent 5a62c4f3c3
commit e1b9156e72
2 changed files with 4 additions and 3 deletions
src/key
factory.js
test/general
key.js

3
src/key/factory.js
View File

@ -198,7 +198,8 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options) {
], config.prefer_hash_algorithm); ], config.prefer_hash_algorithm);
signaturePacket.preferredCompressionAlgorithms = createdPreferredAlgos([ signaturePacket.preferredCompressionAlgorithms = createdPreferredAlgos([
enums.compression.zlib, enums.compression.zlib,
enums.compression.zip enums.compression.zip,
enums.compression.uncompressed
], config.compression); ], config.compression);
if (index === 0) { if (index === 0) {
signaturePacket.isPrimaryUserID = true; signaturePacket.isPrimaryUserID = true;

4
test/general/key.js
View File

@ -1679,7 +1679,7 @@ function versionSpecificTests() {
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512, hash.sha1]); expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha256, hash.sha512, hash.sha1]);
const compr = openpgp.enums.compression; 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]); expect(key.users[0].selfCertifications[0].features).to.eql(openpgp.config.v5_keys ? [7] : [1]);
}; };
const opt = {numBits: 512, userIds: 'test <a@b.com>', passphrase: 'hello'}; const opt = {numBits: 512, userIds: 'test <a@b.com>', passphrase: 'hello'};
@ -1721,7 +1721,7 @@ function versionSpecificTests() {
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha1]); expect(key.users[0].selfCertifications[0].preferredHashAlgorithms).to.eql([hash.sha224, hash.sha256, hash.sha512, hash.sha1]);
const compr = openpgp.enums.compression; 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]); expect(key.users[0].selfCertifications[0].features).to.eql(openpgp.config.v5_keys ? [7] : [1]);
}; };
const opt = {numBits: 512, userIds: 'test <a@b.com>', passphrase: 'hello'}; const opt = {numBits: 512, userIds: 'test <a@b.com>', passphrase: 'hello'};