Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 14:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added passphrase support to importing private key

Browse Source
This commit is contained in:
Matt C 2018-01-12 12:03:46 +00:00
parent f07263ca2a
commit 6a67fe09de
2 changed files with 4015 additions and 4000 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8001
src/core/config/OperationConfig.js
View File

File diff suppressed because it is too large Load Diff

14
src/core/operations/PGP.js
View File

@ -162,15 +162,25 @@ const PGP = {
async runDecrypt(input, args) {
let encryptedMessage = input,
plainPrivateKey = args[0],
privateKey = args[0],
passphrase = args[1],
keyring = new kbpgp.keyring.KeyRing();
let key, plaintextMessage;
try {
key = await promisify(kbpgp.KeyManager.import_from_armored_pgp)({
armored: plainPrivateKey,
armored: privateKey,
});
if (key.is_pgp_locked() && passphrase) {
if (passphrase) {
await promisify(key.unlock_pgp, key)({
passphrase
});
} else if (!passphrase) {
throw "Did not provide passphrase with locked private key.";
}
}
} catch (err) {
throw `Could not import private key: ${err}`;
}