Switch back to official libwebauthn repo

Author: msirringhaus

credentialsd-common/Cargo.toml

@@ -8,6 +8,6 @@ license = "LGPL-3.0-only"
 [dependencies]
 futures-lite = "2.6.0"
 # libwebauthn = "0.2"
-libwebauthn = { git = "https://github.com/msirringhaus/libwebauthn.git", branch="nfc_followup", features = ["libnfc", "pcsc"] }
+libwebauthn = { git = "https://github.com/linux-credentials/libwebauthn.git", revision="604b53b", features = ["libnfc","pcsc"] }
 serde = { version = "1", features = ["derive"] }
 zvariant = "5.6.0"

credentialsd-ui/Cargo.lock

@@ -14,7 +14,7 @@ async-trait = "0.1.88"
 base64 = "0.22.1"
 credentialsd-common = { path = "../credentialsd-common" }
 futures-lite = "2.6.0"
-libwebauthn = { git = "https://github.com/msirringhaus/libwebauthn.git", branch="nfc_followup", features = ["libnfc","pcsc"] }
+libwebauthn = { git = "https://github.com/linux-credentials/libwebauthn.git", revision="604b53b", features = ["libnfc","pcsc"] }
 # libwebauthn = "~0.2.2"
 openssl = "0.10.72"
 rand = "0.9.2"

credentialsd/Cargo.lock

@@ -35,15 +35,9 @@ impl InProcessNfcHandler {
         failures: &mut usize,
         prev_nfc_state: &NfcStateInternal,
     ) -> Result<NfcStateInternal, Error> {
-        match libwebauthn::transport::nfc::list_devices().await {
-            Ok(mut hid_devices) => {
-                if hid_devices.is_empty() {
-                    let state = NfcStateInternal::Waiting;
-                    Ok(state)
-                } else {
-                    Ok(NfcStateInternal::Connected(hid_devices.swap_remove(0)))
-                }
-            }
+        match libwebauthn::transport::nfc::get_nfc_device().await {
+            Ok(None) => Ok(NfcStateInternal::Waiting),
+            Ok(Some(hid_device)) => Ok(NfcStateInternal::Connected(hid_device)),
             Err(err) => {
                 *failures += 1;
                 if *failures == 5 {