beenull/CyberChef
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

PGP ops no longer require a key to be in date

Browse source
This commit is contained in:
n1474335 2018-05-10 15:34:10 +00:00
parent 403296cc59
commit df7c1721f5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/operations/PGP.js
View file

@ -90,13 +90,16 @@ const PGP = {
try {
const key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
armored: privateKey,
opts: {
"no_check_keys": true
}
});
if (key.is_pgp_locked() && passphrase) {
if (key.is_pgp_locked()) {
if (passphrase) {
await promisify(key.unlock_pgp.bind(key))({
passphrase
});
} else if (!passphrase) {
} else {
throw "Did not provide passphrase with locked private key.";
}
}
@ -118,6 +121,9 @@ const PGP = {
try {
const key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
armored: publicKey,
opts: {
"no_check_keys": true
}
});
return key;
} catch (err) {