diff --git a/apps-baosec/vault2/Cargo.toml b/apps-baosec/vault2/Cargo.toml index d95ef5662..18f1689b1 100644 --- a/apps-baosec/vault2/Cargo.toml +++ b/apps-baosec/vault2/Cargo.toml @@ -18,7 +18,7 @@ xous-names = { package = "xous-api-names", version = "0.9.67" } locales = { path = "../../locales" } pddb = { path = "../../services/pddb" } modals = { path = "../../services/modals", features = ["no-gam"] } -backup = { path = "../../apps/vault/libraries/backup" } +backup = { path = "./libraries/backup", package = "backup-vault2" } byteorder = { version = "1.4.3", default-features = false } arrayref = "0.3.6" subtle = { version = "2.5.0", features = ["core_hint_black_box"] } @@ -36,8 +36,8 @@ xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branc keystore = { path = "../../services/keystore" } # opensk -ctap-crypto = { path = "../../apps/vault/libraries/crypto" } -cbor = { path = "../../apps/vault/libraries/cbor" } +ctap-crypto = { path = "./libraries/crypto", package = "ctap-crypto-vault2" } +cbor = { path = "./libraries/cbor", package = "cbor-vault2" } persistent_store = { path = "../../apps/vault/libraries/persistent_store" } ed25519-compact = { version = "1", default-features = false, optional = true } rand = { version = "0.8.5", optional = true } diff --git a/apps-baosec/vault2/src/actions.rs b/apps-baosec/vault2/src/actions.rs index 8a73dad77..af86feed0 100644 --- a/apps-baosec/vault2/src/actions.rs +++ b/apps-baosec/vault2/src/actions.rs @@ -1147,18 +1147,22 @@ impl ActionManager { if let Some(qr_uri) = qr_data.content { // now parse the QR URL. See spec below /* - - otpauth:// - - enroll TOTP token - - overwrites if previous exists - - pwauth://pass/?time=2025-11-27T13:06:02+08:00 - - prompts to type password if it's in the database - - prompts to add new password (autogenerated) if it's not (need a new special character flow: ! @ # $ % ^ * ( ) - _ + = allowed ) - - pwauth://new/?pass= - - add a password to the password store (no 'time?' to simplify parsing of complicated passwords) - - prompt to allow, since the QR code is unauthenticated - - time://2025-11-27T13:06:02+08:00 -> time setting - - search:// -> search for an item in a list - - search://?time=2025-11-27T13:06:02+08:00 -> search for an item in a list & sets time + - otpauth:// + - enroll TOTP token + - overwrites if previous exists + - time://2025-11-27T13:06:02+08:00 + - set RTC offset + - pin:// + - Use this as the PIN value for the token + - pwauth://pass/?time=2025-11-27T13:06:02+08:00 + - prompts to type password if it's in the database + - prompts to add new password (autogenerated) if it's not (need a new special character flow: ! @ # $ % ^ * ( ) - _ + = allowed ) + - pwauth://new/?pass= + - add a password to the password store (no 'time?' to simplify parsing of complicated passwords) + - prompt to allow, since the QR code is unauthenticated + - search:// + - search://?time=2025-11-27T13:06:02+08:00 + - search for a list time and/or search & set time */ if let Some((request, data)) = qr_uri.split_once("://") { match request {