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

Apply edits as suggested in review of pull #446

Browse Source
This commit is contained in:
evilaliv3 2016-04-25 18:35:50 +02:00
parent afc2c95238
commit 61470ad068
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/key.js
View File

@ -374,16 +374,11 @@ Key.prototype.encrypt = function(passphrase) {
if (this.isPrivate()) { if (this.isPrivate()) {
var keys = this.getAllKeyPackets(); var keys = this.getAllKeyPackets();
for (var i = 0; i < keys.length; i++) { for (var i = 0; i < keys.length; i++) {
try {
keys[i].encrypt(passphrase); keys[i].encrypt(passphrase);
} catch (e) {
return false;
}
} }
} else { } else {
throw new Error("Nothing to encrypt in a public key"); throw new Error("Nothing to encrypt in a public key");
} }
return true;
}; };
/** /**

4
test/general/key.js
View File

@ -716,9 +716,13 @@ var pgp_desktop_priv =
var armor2 = key.armor(); var armor2 = key.armor();
expect(armor1).to.equal(armor2); expect(armor1).to.equal(armor2);
expect(key.decrypt('passphrase')).to.be.true; expect(key.decrypt('passphrase')).to.be.true;
expect(key.primaryKey.isDecrypted).to.be.true;
expect(key.encrypt('new_passphrase')).to.be.true; expect(key.encrypt('new_passphrase')).to.be.true;
expect(key.primaryKey.isDecrypted).to.be.false;
expect(key.decrypt('passphrase')).to.be.false; expect(key.decrypt('passphrase')).to.be.false;
expect(key.primaryKey.isDecrypted).to.be.false;
expect(key.decrypt('new_passphrase')).to.be.true; expect(key.decrypt('new_passphrase')).to.be.true;
expect(key.primaryKey.isDecrypted).to.be.true;
var armor3 = key.armor(); var armor3 = key.armor();
expect(armor3).to.not.equal(armor1); expect(armor3).to.not.equal(armor1);
done(); done();