Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-11-24 06:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disallow using Argon2 S2K without AEAD

Browse Source 
RFC9580 says that:

   Argon2 is only used with AEAD (S2K usage octet 253).  An
   implementation MUST NOT create and MUST reject as malformed any
   secret key packet where the S2K usage octet is not AEAD (253) and
   the S2K specifier type is Argon2.
This commit is contained in:
Daniel Huigens 2024-07-04 21:44:48 +02:00
parent 5268c484e9
commit dbeafcd6ca
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/packet/secret_key.js
View File

@ -568,6 +568,9 @@ class SecretKeyPacket extends PublicKeyPacket {
* @returns encryption key
*/
async function produceEncryptionKey(keyVersion, s2k, passphrase, cipherAlgo, aeadMode, serializedPacketTag, isLegacyAEAD) {
if (s2k.type === 'argon2' && !aeadMode) {
throw new Error('Using Argon2 S2K without AEAD is not allowed');
}
const { keySize } = crypto.getCipherParams(cipherAlgo);
const derivedKey = await s2k.produceKey(passphrase, keySize);
if (!aeadMode || keyVersion === 5 || isLegacyAEAD) {

5
test/general/openpgp.js
View File

@ -1416,7 +1416,10 @@ VFBLG8uc9IiaKann/DYBAJcZNZHRSfpDoV2pUA5EAEi2MdjxkRysFQnYPRAu
const locked = await openpgp.encryptKey({
privateKey: key,
passphrase: passphrase,
config: { s2kType: openpgp.enums.s2k.argon2 }
config: {
s2kType: openpgp.enums.s2k.argon2,
aeadProtect: true
}
});
expect(key.isDecrypted()).to.be.true;
expect(locked.isDecrypted()).to.be.false;