Fix bio metadata handling on older devices.

Yubico · Jan 26, 2024 · 3778238 · 3778238
1 parent 1f320e9
commit 3778238
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tests/device/test_hsmauth.py b/tests/device/test_hsmauth.py
@@ -134,15 +134,15 @@ def test_import_credential_symmetric_works(self, session):
     @condition.min_version(5, 6)
     def test_import_credential_asymmetric_unsupported_key(self, session):
         private_key = ec.generate_private_key(
-            ec.SECP224R1, backend=default_backend()
+            ec.SECP224R1(), backend=default_backend()
         )  # curve secp224r1 is not supported
 
         with pytest.raises(ValueError):
             import_key_asymmetric(session, DEFAULT_MANAGEMENT_KEY, private_key)
 
     @condition.min_version(5, 6)
     def test_import_credential_asymmetric_works(self, session):
-        private_key = ec.generate_private_key(ec.SECP256R1, backend=default_backend())
+        private_key = ec.generate_private_key(ec.SECP256R1(), backend=default_backend())
         credential = import_key_asymmetric(session, DEFAULT_MANAGEMENT_KEY, private_key)
 
         public_key = private_key.public_key()

diff --git a/ykman/piv.py b/ykman/piv.py
@@ -546,9 +546,9 @@ def get_piv_info(session: PivSession):
             ] = f"Configured, {bio.attempts_remaining} attempts remaining"
         else:
             info["Biometrics"] = "Not configured"
-
     except NotSupportedError:
         pass
+
     try:
         metadata = session.get_management_key_metadata()
         if metadata.default_value:

diff --git a/yubikit/piv.py b/yubikit/piv.py
@@ -786,7 +786,7 @@ def get_bio_metadata(self) -> BioMetadata:
                 self.protocol.send_apdu(0, INS_GET_METADATA, 0, SLOT_OCC_AUTH)
             )
         except ApduError as e:
-            if e.sw == SW.REFERENCE_DATA_NOT_FOUND:
+            if e.sw in (SW.REFERENCE_DATA_NOT_FOUND, SW.INVALID_INSTRUCTION):
                 raise NotSupportedError(
                     "Biometric verification not supported by this YuibKey"
                 )