fix AssertionError: ignore keys which do not correspond to key on device

romanz · Dec 23, 2023 · 2a51418 · 2a51418
1 parent dace3eb
commit 2a51418
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/libagent/gpg/agent.py b/libagent/gpg/agent.py
@@ -171,8 +171,10 @@ def get_identity(self, keygrip):
         pubkey = protocol.PublicKey(
             curve_name=curve_name, created=pubkey_dict['created'],
             verifying_key=verifying_key, ecdh=ecdh)
-        assert pubkey.key_id() == pubkey_dict['key_id']
-        assert pubkey.keygrip() == keygrip_bytes
+
+        if (pubkey.key_id() != pubkey_dict['key_id'] or pubkey.keygrip() != keygrip_bytes):
+            raise KeyError('{} keygrip does not correspond to key on device.'.format(keygrip))
+
         return identity
 
     def pksign(self, conn):