Apply edits as suggested in review of pull #446

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

View File

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

View File

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