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

Throw in encryptSessionKey if no keys or passwords are provided (#1547)

Browse Source 
Previously, the operation would return an empty message.
This commit is contained in:
larabr 2022-07-27 17:47:47 +02:00 committed by GitHub
parent bd1a7db46f
commit e862d5f20b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openpgp.js
View File

@ -240,7 +240,7 @@ export async function encryptKey({ privateKey, passphrase, config, ...rest }) {
/** /**
* Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys` or `passwords` * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys`, `passwords` or `sessionKeys`
* must be specified. If signing keys are specified, those will be used to sign the message. * must be specified. If signing keys are specified, those will be used to sign the message.
* @param {Object} options * @param {Object} options
* @param {Message} options.message - Message to be encrypted as created by {@link createMessage} * @param {Message} options.message - Message to be encrypted as created by {@link createMessage}
@ -555,6 +555,10 @@ export async function encryptSessionKey({ data, algorithm, aeadAlgorithm, encryp
if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.encryptSessionKey, pass `encryptionKeys` instead'); if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.encryptSessionKey, pass `encryptionKeys` instead');
const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`); const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
if ((!encryptionKeys || encryptionKeys.length === 0) && (!passwords || passwords.length === 0)) {
throw new Error('No encryption keys or passwords provided.');
}
try { try {
const message = await Message.encryptSessionKey(data, algorithm, aeadAlgorithm, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config); const message = await Message.encryptSessionKey(data, algorithm, aeadAlgorithm, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config);
return formatObject(message, format, config); return formatObject(message, format, config);

7
test/general/openpgp.js
View File

@ -2015,6 +2015,13 @@ aOU=
const [decryptedSessionKey] = await openpgp.decryptSessionKeys({ message: objectMessage, passwords }); const [decryptedSessionKey] = await openpgp.decryptSessionKeys({ message: objectMessage, passwords });
expect(decryptedSessionKey).to.deep.equal(sessionKey); expect(decryptedSessionKey).to.deep.equal(sessionKey);
}); });
it('passing no encryption keys or passwords leads to exception', async function() {
await expect(openpgp.encryptSessionKey({
algorithm: 'aes256',
data: util.hexToUint8Array('3e99c1bb485e70a1fcef09a7ad8d38d171015243bbdd853e1a2b0e334d122ff3')
})).to.be.rejectedWith(/No encryption keys or passwords provided/);
});
}); });
describe('encrypt, decrypt, sign, verify - integration tests', function() { describe('encrypt, decrypt, sign, verify - integration tests', function() {