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

Keyring: don't break on error reading armored key.

Browse Source
This commit is contained in:
Thomas Oberndörfer 2014-04-04 17:14:39 +02:00
parent ced145865e
commit 5e74302973
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/keyring/localstore.js
View File

@ -24,7 +24,8 @@
module.exports = LocalStore; module.exports = LocalStore;
var config = require('../config'), var config = require('../config'),
keyModule = require('../key.js'); keyModule = require('../key.js'),
util = require('../util.js');
function LocalStore(prefix) { function LocalStore(prefix) {
prefix = prefix || 'openpgp-'; prefix = prefix || 'openpgp-';
@ -65,8 +66,12 @@ function loadKeys(storage, itemname) {
if (armoredKeys !== null && armoredKeys.length !== 0) { if (armoredKeys !== null && armoredKeys.length !== 0) {
var key; var key;
for (var i = 0; i < armoredKeys.length; i++) { for (var i = 0; i < armoredKeys.length; i++) {
key = keyModule.readArmored(armoredKeys[i]).keys[0]; key = keyModule.readArmored(armoredKeys[i]);
keys.push(key); if (!key.err) {
keys.push(key.keys[0]);
} else {
util.print_debug("Error reading armored key from keyring index: " + i);
}
} }
} }
return keys; return keys;