Merge pull request #1434 from keepkey/master

made sure to check if x_pubkey is valid xpub before parsing it

plugins/keepkey.py

@@ -283,6 +283,7 @@ class Plugin(BasePlugin):
                         )
                         # find which key is mine
                         for x_pubkey in x_pubkeys:
+                            if is_extended_pubkey(x_pubkey):
                                 xpub, s = BIP32_Account.parse_xpubkey(x_pubkey)
                                 if xpub in self.xpub_path:
                                     xpub_n = self.get_client().expand_path(self.xpub_path[xpub])

plugins/trezor.py

@@ -282,6 +282,7 @@ class Plugin(BasePlugin):
                         )
                         # find which key is mine
                         for x_pubkey in x_pubkeys:
+                            if is_extended_pubkey(x_pubkey):
                                 xpub, s = BIP32_Account.parse_xpubkey(x_pubkey)
                                 if xpub in self.xpub_path:
                                     xpub_n = self.get_client().expand_path(self.xpub_path[xpub])