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

Fix error message for legacy encrypted private keys

Browse Source
This commit is contained in:
Daniel Huigens 2020-02-20 15:53:03 +01:00
parent c6ed05d2c3
commit 2131fb0978
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/packet/secret_key.js
View File

@ -324,7 +324,7 @@ async function produceEncryptionKey(s2k, passphrase, algorithm) {
* @async * @async
*/ */
SecretKey.prototype.decrypt = async function (passphrase) { SecretKey.prototype.decrypt = async function (passphrase) {
if (this.s2k.type === 'gnu-dummy') { if (this.s2k && this.s2k.type === 'gnu-dummy') {
this.isEncrypted = false; this.isEncrypted = false;
return false; return false;
} }
@ -336,8 +336,10 @@ SecretKey.prototype.decrypt = async function (passphrase) {
let key; let key;
if (this.s2k_usage === 254 || this.s2k_usage === 253) { if (this.s2k_usage === 254 || this.s2k_usage === 253) {
key = await produceEncryptionKey(this.s2k, passphrase, this.symmetric); key = await produceEncryptionKey(this.s2k, passphrase, this.symmetric);
} else if (this.s2k_usage === 255) {
throw new Error('Encrypted private key is authenticated using an insecure two-byte hash');
} else { } else {
throw new Error('Unsupported legacy encrypted key'); throw new Error('Private key is encrypted using an insecure S2K function: unsalted MD5');
} }
let cleartext; let cleartext;