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

Throw error before decrypting in non-MDC packets

Browse Source
This commit is contained in:
Daniel Huigens 2019-02-12 11:43:39 +01:00
parent 40360b4955
commit 54fc1dde3d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/packet/symmetrically_encrypted.js
View File

@ -80,16 +80,17 @@ SymmetricallyEncrypted.prototype.write = function () {
* @async * @async
*/ */
SymmetricallyEncrypted.prototype.decrypt = async function (sessionKeyAlgorithm, key) { SymmetricallyEncrypted.prototype.decrypt = async function (sessionKeyAlgorithm, key) {
// If MDC errors are not being ignored, all missing MDC packets in symmetrically encrypted data should throw an error
if (!this.ignore_mdc_error) {
throw new Error('Decryption failed due to missing MDC.');
}
this.encrypted = await stream.readToEnd(this.encrypted); this.encrypted = await stream.readToEnd(this.encrypted);
const decrypted = await crypto.cfb.decrypt(sessionKeyAlgorithm, key, const decrypted = await crypto.cfb.decrypt(sessionKeyAlgorithm, key,
this.encrypted.subarray(crypto.cipher[sessionKeyAlgorithm].blockSize + 2), this.encrypted.subarray(crypto.cipher[sessionKeyAlgorithm].blockSize + 2),
this.encrypted.subarray(2, crypto.cipher[sessionKeyAlgorithm].blockSize + 2) this.encrypted.subarray(2, crypto.cipher[sessionKeyAlgorithm].blockSize + 2)
); );
// If MDC errors are not being ignored, all missing MDC packets in symmetrically encrypted data should throw an error
if (!this.ignore_mdc_error) {
throw new Error('Decryption failed due to missing MDC.');
}
await this.packets.read(decrypted); await this.packets.read(decrypted);
return true; return true;