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

Cleanup API for key.decrypt and align unit tests

Browse Source
This commit is contained in:
evilaliv3 2016-04-27 16:06:52 +02:00
parent 1007637f39
commit a5fdc36062
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/key.js
View File

@ -368,7 +368,6 @@ Key.prototype.getEncryptionKeyPacket = function() {
/** /**
* Encrypts all secret key and subkey packets * Encrypts all secret key and subkey packets
* @param {String} passphrase * @param {String} passphrase
* @return {Boolean} true if all key and subkey packets encrypted successfully
*/ */
Key.prototype.encrypt = function(passphrase) { Key.prototype.encrypt = function(passphrase) {
if (this.isPrivate()) { if (this.isPrivate()) {
@ -376,8 +375,6 @@ Key.prototype.encrypt = function(passphrase) {
for (var i = 0; i < keys.length; i++) { for (var i = 0; i < keys.length; i++) {
keys[i].encrypt(passphrase); keys[i].encrypt(passphrase);
} }
} else {
throw new Error("Nothing to encrypt in a public key");
} }
}; };

2
test/general/key.js
View File

@ -717,7 +717,7 @@ var pgp_desktop_priv =
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.primaryKey.isDecrypted).to.be.true;
expect(key.encrypt('new_passphrase')).to.be.true; key.encrypt('new_passphrase');
expect(key.primaryKey.isDecrypted).to.be.false; 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.primaryKey.isDecrypted).to.be.false;