From 5e7430297307d75d72edf33109d1c063e0a06d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Obernd=C3=B6rfer?= <toberndo@yarkon.de>
Date: Fri, 4 Apr 2014 17:14:39 +0200
Subject: [PATCH] Keyring: don't break on error reading armored key.

---
 src/keyring/localstore.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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