Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2026-03-11 19:24:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix parsing of messages with unsupported SKESK s2k type

Browse Source 
These messages should still be decrypt-able if they include at least one
supported ESK packet.
This commit is contained in:
larabr
2023-06-26 15:39:56 +02:00
parent 9ed1135d74
commit f5b5b73f07
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/type/s2k.js
View File

@@ -31,6 +31,7 @@
import defaultConfig from '../config';
import crypto from '../crypto';
import enums from '../enums';
import { UnsupportedError } from '../packet/packet';
import util from '../util';
class S2K {
@@ -70,7 +71,11 @@ class S2K {
*/
read(bytes) {
let i = 0;
this.type = enums.read(enums.s2k, bytes[i++]);
try {
this.type = enums.read(enums.s2k, bytes[i++]);
} catch (err) {
throw new UnsupportedError('Unknown S2K type.');
}
this.algorithm = bytes[i++];
switch (this.type) {
@@ -98,15 +103,15 @@ class S2K {
this.type = 'gnu-dummy';
// GnuPG extension mode 1001 -- don't write secret key at all
} else {
throw new Error('Unknown s2k gnu protection mode.');
throw new UnsupportedError('Unknown s2k gnu protection mode.');
}
} else {
throw new Error('Unknown s2k type.');
throw new UnsupportedError('Unknown s2k type.');
}
break;
default:
throw new Error('Unknown s2k type.');
throw new UnsupportedError('Unknown s2k type.'); // unreachable
}
return i;