Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-07-04 12:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only add SHA3 preferences to v6 keys

Browse Source 
To ensure compatibility with older mobile clients, which may not
support verifying SHA3 message signatures
This commit is contained in:
larabr 2024-03-01 14:17:12 +01:00
parent 55f8ab2629
commit 7cf978092b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/key/factory.js
View File

@ -219,8 +219,7 @@ async function wrapKeyObject(secretKeyPacket, secretSubkeyPackets, options, conf
signatureProperties.preferredHashAlgorithms = createPreferredAlgos([ signatureProperties.preferredHashAlgorithms = createPreferredAlgos([
enums.hash.sha512, enums.hash.sha512,
enums.hash.sha256, enums.hash.sha256,
enums.hash.sha3_512, ...(secretKeyPacket.version === 6 ? [enums.hash.sha3_512, enums.hash.sha3_256] : [])
enums.hash.sha3_256
], config.preferredHashAlgorithm); ], config.preferredHashAlgorithm);
signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([ signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([
enums.compression.uncompressed, enums.compression.uncompressed,

12
test/general/key.js
View File

@ -2261,7 +2261,11 @@ function versionSpecificTests() {
]); ]);
} }
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256]); expect(selfSignature.preferredHashAlgorithms).to.eql(
openpgp.config.v6Keys ?
[hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256] :
[hash.sha512, hash.sha256]
);
const compr = openpgp.enums.compression; const compr = openpgp.enums.compression;
expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed, compr.zlib, compr.zip]); expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.uncompressed, compr.zlib, compr.zip]);
@ -2313,7 +2317,11 @@ function versionSpecificTests() {
]); ]);
} }
const hash = openpgp.enums.hash; const hash = openpgp.enums.hash;
expect(selfSignature.preferredHashAlgorithms).to.eql([hash.sha224, hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256]); expect(selfSignature.preferredHashAlgorithms).to.eql(
openpgp.config.v6Keys ?
[hash.sha224, hash.sha512, hash.sha256, hash.sha3_512, hash.sha3_256] :
[hash.sha224, hash.sha512, hash.sha256]
);
const compr = openpgp.enums.compression; const compr = openpgp.enums.compression;
expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed, compr.zip]); expect(selfSignature.preferredCompressionAlgorithms).to.eql([compr.zlib, compr.uncompressed, compr.zip]);