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

Added test for encryption with revoked subkey

Browse Source
This commit is contained in:
Mahrud Sayrafi 2018-03-06 19:33:00 -08:00 committed by Sanjana Rajan
parent 23a4141ce9
commit 47006069d1
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/message.js
View File

@ -302,11 +302,12 @@ export async function encryptSessionKey(sessionKey, symAlgo, publicKeys, passwor
const packetlist = new packet.List();
if (publicKeys) {
const results = await Promise.all(publicKeys.map(async function(key) {
await key.verifyKeyPackets(undefined, date);
const encryptionKeyPacket = key.getEncryptionKeyPacket(undefined, date);
const results = await Promise.all(publicKeys.map(async function(publicKey) {
await publicKey.verifyKeyPackets(undefined, date);
const encryptionKeyPacket = publicKey.getEncryptionKeyPacket(undefined, date);
if (!encryptionKeyPacket) {
throw new Error('Could not find valid key packet for encryption in key ' + key.primaryKey.getKeyId().toHex());
throw new Error('Could not find valid key packet for encryption in key ' +
publicKey.primaryKey.getKeyId().toHex());
}
const pkESKeyPacket = new packet.PublicKeyEncryptedSessionKey();
pkESKeyPacket.publicKeyId = wildcard ? type_keyid.wildcard() : encryptionKeyPacket.getKeyId();

9
test/general/key.js
View File

@ -1283,5 +1283,14 @@ describe('Key', function() {
expect(k.getEncryptionKeyPacket()).to.not.be.null;
})
});
it('Reject encryption with revoked subkey', function() {
const key = openpgp.key.readArmored(pub_revoked).keys[0];
return openpgp.encrypt({publicKeys: [key], data: 'random data'}).then(() => {
throw new Error('encryptSessionKey should not encrypt with revoked public key');
}).catch(function(error) {
expect(error.message).to.equal('Error encrypting message: Could not find valid key packet for encryption in key ' + key.primaryKey.getKeyId().toHex());
});
});
});