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

Fix getPrivateKeyForAddress. Replace global openpgp with specific modules.

Browse Source
This commit is contained in:
Thomas Oberndörfer 2014-02-06 17:26:55 +01:00
parent 7ca8414fc8
commit c47e1d8780
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/keyring/keyring.js
View File

@ -17,11 +17,15 @@
/** /**
* The class that deals with storage of the keyring. Currently the only option is to use HTML5 local storage. * The class that deals with storage of the keyring. Currently the only option is to use HTML5 local storage.
* @requires openpgp * @requires enums
* @requires key
* @requires util
* @module keyring/keyring * @module keyring/keyring
*/ */
var openpgp = require('../'); var enums = require('../enums.js'),
keyModule = require('../key.js'),
util = require('../util.js');
/** /**
* Callback to check if a key matches the input * Callback to check if a key matches the input
@ -87,7 +91,7 @@ function emailCheck(email, key) {
function idCheck(id, key) { function idCheck(id, key) {
var keyids = key.getKeyIds(); var keyids = key.getKeyIds();
for (var i = 0; i < keyids.length; i++) { for (var i = 0; i < keyids.length; i++) {
if (openpgp.util.hexstrdump(keyids[i].write()) == id) { if (util.hexstrdump(keyids[i].write()) == id) {
return true; return true;
} }
} }
@ -107,12 +111,12 @@ function checkForIdentityAndKeyTypeMatch(keys, identityFunction, identityInput,
for (var p = 0; p < keys.length; p++) { for (var p = 0; p < keys.length; p++) {
var key = keys[p]; var key = keys[p];
switch (keyType) { switch (keyType) {
case openpgp.enums.packet.publicKey: case enums.packet.publicKey:
if (key.isPublic() && identityFunction(identityInput, key)) { if (key.isPublic() && identityFunction(identityInput, key)) {
results.push(key); results.push(key);
} }
break; break;
case openpgp.enums.packet.private_key: case enums.packet.secretKey:
if (key.isPrivate() && identityFunction(identityInput, key)) { if (key.isPrivate() && identityFunction(identityInput, key)) {
results.push(key); results.push(key);
} }
@ -128,7 +132,7 @@ function checkForIdentityAndKeyTypeMatch(keys, identityFunction, identityInput,
* @return {Array<module:key~Key>} The public keys associated with provided email address. * @return {Array<module:key~Key>} The public keys associated with provided email address.
*/ */
Keyring.prototype.getPublicKeyForAddress = function (email) { Keyring.prototype.getPublicKeyForAddress = function (email) {
return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, openpgp.enums.packet.publicKey); return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, enums.packet.publicKey);
}; };
/** /**
@ -137,7 +141,7 @@ Keyring.prototype.getPublicKeyForAddress = function (email) {
* @return {Array<module:key~Key>} private keys found * @return {Array<module:key~Key>} private keys found
*/ */
Keyring.prototype.getPrivateKeyForAddress = function (email) { Keyring.prototype.getPrivateKeyForAddress = function (email) {
return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, openpgp.enums.packet.secretKey); return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, enums.packet.secretKey);
}; };
/** /**
@ -146,7 +150,7 @@ Keyring.prototype.getPrivateKeyForAddress = function (email) {
* @return {Array<module:key~Key>} public keys found * @return {Array<module:key~Key>} public keys found
*/ */
Keyring.prototype.getKeysForKeyId = function (keyId) { Keyring.prototype.getKeysForKeyId = function (keyId) {
return checkForIdentityAndKeyTypeMatch(this.keys, idCheck, keyId, openpgp.enums.packet.publicKey); return checkForIdentityAndKeyTypeMatch(this.keys, idCheck, keyId, enums.packet.publicKey);
}; };
/** /**
@ -154,7 +158,7 @@ Keyring.prototype.getKeysForKeyId = function (keyId) {
* @param {String} armored message to read the keys/key from * @param {String} armored message to read the keys/key from
*/ */
Keyring.prototype.importKey = function (armored) { Keyring.prototype.importKey = function (armored) {
this.keys = this.keys.concat(openpgp.key.readArmored(armored).keys); this.keys = this.keys.concat(keyModule.readArmored(armored).keys);
return true; return true;
}; };