PIV: Improve handling of malformed certificate data object.

Yubico · Nov 24, 2023 · 349852a · 349852a
1 parent 6734213
commit 349852a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/yubikit/piv.py b/yubikit/piv.py
@@ -808,11 +808,11 @@ def get_certificate(self, slot: SLOT) -> x509.Certificate:
         logger.debug(f"Reading certificate in slot {slot}")
         try:
             data = Tlv.parse_dict(self.get_object(OBJECT_ID.from_slot(slot)))
-        except ValueError:
+            cert_data = data[TAG_CERTIFICATE]
+            cert_info = data[TAG_CERT_INFO][0] if TAG_CERT_INFO in data else 0
+        except (ValueError, KeyError):
             raise BadResponseError("Malformed certificate data object")
 
-        cert_data = data[TAG_CERTIFICATE]
-        cert_info = data[TAG_CERT_INFO][0] if TAG_CERT_INFO in data else 0
         if cert_info == 1:
             logger.debug("Certificate is compressed, decompressing...")
             # Compressed certificate