Merge pull request #96 from tumpaproject/feat/01092

fix: reset user pin

Author: kushaldas

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tumpa"
-version = "0.10.91"
+version = "0.10.92"
 description = "The Usability Minded PGP Application"
 authors = ["Kushal Das"]
 edition = "2021"
@@ -26,11 +26,11 @@ zeroize = "1"
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 # Desktop gets the full libtumpa: card (PC/SC via card-backend-pcsc) +
 # network (VKS upload, email verification, WKD fetch).
-# 0.3.2 pulls wecanencrypt 0.15.0 with the Curve25519 0x40 prefix +
+# 0.4.0 pulls wecanencrypt 0.16.0 with the Curve25519 0x40 prefix +
 # Nitrokey 3 (opcard-rs >= 1.5) ECC card upload fix, plus the
 # `factory_reset_card`, per-card `ident` threading, and the schema-v4
 # summary helpers (`list_keys_summary`, `list_all_card_keys`).
-libtumpa = { version = "0.3.2", default-features = false, features = ["card", "network"] }
+libtumpa = { version = "0.4.1", default-features = false, features = ["card", "network"] }
 dirs = "6"
 
 # Mobile builds swap PC/SC for the external backend provider.
@@ -41,15 +41,16 @@ dirs = "6"
 #   reqwest with native-tls via wecanencrypt, which blocks
 #   cross-compilation.
 [target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies]
-libtumpa = { version = "0.3.2", default-features = false, features = ["card-mobile"] }
+libtumpa = { version = "0.4.1", default-features = false, features = ["card-mobile"] }
 tauri-plugin-tumpa-card = { path = "../crates/tauri-plugin-tumpa-card" }
 # Needed so we can hand libtumpa a Box<dyn CardBackend + Send + Sync>
 # from the backend provider closure we register in setup().
 card-backend = "0.2"
 
 # Integration tests under `tests/` exercise wecanencrypt APIs directly
-# (predating libtumpa). Keep the dev-dep so they keep compiling. libtumpa
-# 0.3.2 pulls wecanencrypt 0.15.0 in as a transitive; match the version
-# here so cargo resolves a single copy.
+# (predating libtumpa). Keep the dev-dep so they keep compiling.
+# libtumpa 0.4.0 pulls wecanencrypt 0.16.0 in as a transitive; match
+# the version here so cargo resolves a single copy.
 [dev-dependencies]
-wecanencrypt = { version = "0.15.0", features = ["keystore", "card-pcsc", "network"] }
+wecanencrypt = { version = "0.16.1", features = ["keystore", "card-pcsc", "network"] }
+

src-tauri/src/commands/card.rs

@@ -130,6 +130,9 @@ pub fn update_card_url(url: String, admin_pin: String) -> Result<(), String> {
 
 #[tauri::command]
 pub fn change_user_pin(admin_pin: String, new_pin: String) -> Result<(), String> {
+    // libtumpa's `change_user_pin` issues RESET RETRY COUNTER (PW1)
+    // after verifying the admin PIN, so it both sets the new user PIN
+    // and unblocks PW1 when its retry counter is at 0.
     let admin = Pin::new(admin_pin.into_bytes());
     let new = Pin::new(new_pin.into_bytes());
     admin::change_user_pin(&admin, &new, None).map_err(|e| e.to_string())