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

Make key.isDecrypted() and key.encrypt() consistent for gnu-dummy keys

Browse Source
This commit is contained in:
Daniel Huigens 2019-05-03 12:37:43 +02:00
parent 10e10effb6
commit bc756d0ed4
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/packet/secret_key.js
View File

@ -164,6 +164,11 @@ SecretKey.prototype.isDecrypted = function() {
* @async
*/
SecretKey.prototype.encrypt = async function (passphrase) {
if (this.isDecrypted() && this.encrypted) { // gnu-dummy
this.isEncrypted = true;
return false;
}
if (this.isDecrypted() && !passphrase) {
this.encrypted = null;
return false;
@ -258,6 +263,7 @@ SecretKey.prototype.decrypt = async function (passphrase) {
i += s2k.read(this.encrypted.subarray(i, this.encrypted.length));
if (s2k.type === 'gnu-dummy') {
this.isEncrypted = false;
return false;
}
key = await produceEncryptionKey(s2k, passphrase, symmetric);

21
test/general/signature.js
View File

@ -338,15 +338,20 @@ describe("Signature", function() {
'=GQsY',
'-----END PGP PRIVATE KEY BLOCK-----'].join("\n"))).keys[0];
const pub_key = (await openpgp.key.readArmored(pub_key_arm1)).keys[0];
const msg = await openpgp.message.readArmored(msg_arm1);
const message = await openpgp.message.readArmored(msg_arm1);
const primaryKey_packet = priv_key_gnupg_ext.primaryKey.write();
expect(priv_key_gnupg_ext.isDecrypted()).to.be.false;
await priv_key_gnupg_ext.decrypt("abcd");
return openpgp.decrypt({ message: msg, privateKeys: [priv_key_gnupg_ext], publicKeys: [pub_key] }).then(function(msg) {
expect(msg.signatures).to.exist;
expect(msg.signatures).to.have.length(1);
expect(msg.signatures[0].valid).to.be.true;
expect(msg.signatures[0].signature.packets.length).to.equal(1);
});
expect(priv_key_gnupg_ext.isDecrypted()).to.be.true;
const msg = await openpgp.decrypt({ message, privateKeys: [priv_key_gnupg_ext], publicKeys: [pub_key] });
expect(msg.signatures).to.exist;
expect(msg.signatures).to.have.length(1);
expect(msg.signatures[0].valid).to.be.true;
expect(msg.signatures[0].signature.packets.length).to.equal(1);
await priv_key_gnupg_ext.encrypt("abcd");
expect(priv_key_gnupg_ext.isDecrypted()).to.be.false;
const primaryKey_packet2 = priv_key_gnupg_ext.primaryKey.write();
expect(primaryKey_packet).to.deep.equal(primaryKey_packet2);
});
it('Verify V4 signature. Hash: SHA1. PK: RSA. Signature Type: 0x00 (binary document)', async function() {