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

Add CAST5 to always-allowed algorithms

Browse Source 
Golang's OpenPGP implementation uses CAST5 as its fallback.
(The spec mandates TripleDES as fallback.)

Fixes #819.
This commit is contained in:
Daniel Huigens 2018-12-21 23:46:02 -05:00
parent 95cc9cecf0
commit 113c4a5f1e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/message.js
View File

@ -187,7 +187,8 @@ Message.prototype.decryptSessionKeys = async function(privateKeys, passwords) {
let algos = [ let algos = [
enums.symmetric.aes256, // Old OpenPGP.js default fallback enums.symmetric.aes256, // Old OpenPGP.js default fallback
enums.symmetric.aes128, // RFC4880bis fallback enums.symmetric.aes128, // RFC4880bis fallback
enums.symmetric.tripledes // RFC4880 fallback enums.symmetric.tripledes, // RFC4880 fallback
enums.symmetric.cast5 // Golang OpenPGP fallback
]; ];
if (primaryUser && primaryUser.selfCertification.preferredSymmetricAlgorithms) { if (primaryUser && primaryUser.selfCertification.preferredSymmetricAlgorithms) {
algos = algos.concat(primaryUser.selfCertification.preferredSymmetricAlgorithms); algos = algos.concat(primaryUser.selfCertification.preferredSymmetricAlgorithms);

12
test/security/preferred_algo_mismatch.js
View File

@ -11,12 +11,12 @@ const messageArmor = `-----BEGIN PGP MESSAGE-----
Version: OpenPGP.js VERSION Version: OpenPGP.js VERSION
Comment: https://openpgpjs.org Comment: https://openpgpjs.org
wYwD3eCUoDfD5yoBA/4rhxaaw+E2ma+LdmLVDBRqxglhIgnM6EgNxzf8J5Ty wYwD3eCUoDfD5yoBA/98Ceee8cVOuwZMscnFXzkldJV6Km/Uozcwsx0+Epqb
ecQBLOf3BjjC72mJ9RqMmvQ16aG4EXXDAUmCP1sBLj+b7V1t4keeyTn+2nXu 31qF6QosSgEBNGet5PXxV3VU5BnjSeMnK3500NFGgLZUYKLqdHmtwj4hIz7S
7Wgu2yq9CvZahRLsayt3y8VodZwTi3K/+gmx1f8EhdLPONQgGkYAqZ3Tyyd0 VpX1fVpp5n8729Fuv9MhRcFrrIrRj5h6Mj8G7xIgCQm+uJTla3X8wRXss8/p
KF3pknplvdI+AXqRs0n2vVr89oIdmQPJFSHEoJtltbSNxhwShdzDvOor2FKJ y57epbYHO9JGAZsQl6kFLOsgtlV/NPwAtjsH/AzsQs3Y6WcudHh0XB3E+ncK
vhGWNysion2aBg0fIbgDUKeXKp8YN44LDTk= BLn6oaBjcnlwdGVk0wJnjV2YZRiZ7V3lUIDdYIMNpL+5qA==
=RYrv =IoHy
-----END PGP MESSAGE-----`; -----END PGP MESSAGE-----`;
const privateKeyArmor = `-----BEGIN PGP PRIVATE KEY BLOCK----- const privateKeyArmor = `-----BEGIN PGP PRIVATE KEY BLOCK-----