diff --git a/Cargo.lock b/Cargo.lock index 24f977de9..9b2512606 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -752,7 +752,7 @@ dependencies = [ "itertools 0.14.0", "p256", "passkey", - "passkey-client", + "passkey-client 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73)", "reqwest", "serde", "serde_json", @@ -3638,12 +3638,25 @@ dependencies = [ [[package]] name = "passkey" version = "0.5.0" -source = "git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73#357cc9672340f6ff1f22a0b210a74de64799fa73" +source = "git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32#043279e92e2eb5f509bf87eb7fa50987fd377e32" dependencies = [ - "passkey-authenticator", - "passkey-client", + "passkey-authenticator 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", + "passkey-client 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", "passkey-transports", - "passkey-types", + "passkey-types 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", +] + +[[package]] +name = "passkey-authenticator" +version = "0.5.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32#043279e92e2eb5f509bf87eb7fa50987fd377e32" +dependencies = [ + "async-trait", + "coset", + "log", + "p256", + "passkey-types 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", + "rand 0.8.5", ] [[package]] @@ -3655,10 +3668,27 @@ dependencies = [ "coset", "log", "p256", - "passkey-types", + "passkey-types 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73)", "rand 0.8.5", ] +[[package]] +name = "passkey-client" +version = "0.5.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32#043279e92e2eb5f509bf87eb7fa50987fd377e32" +dependencies = [ + "ciborium", + "coset", + "idna", + "itertools 0.14.0", + "passkey-authenticator 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", + "passkey-types 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", + "public-suffix 0.1.3 (git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32)", + "serde", + "serde_json", + "url", +] + [[package]] name = "passkey-client" version = "0.5.0" @@ -3669,9 +3699,9 @@ dependencies = [ "idna", "itertools 0.14.0", "nom", - "passkey-authenticator", - "passkey-types", - "public-suffix", + "passkey-authenticator 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73)", + "passkey-types 0.5.0 (git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73)", + "public-suffix 0.1.3 (git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73)", "serde", "serde_json", "url", @@ -3680,7 +3710,28 @@ dependencies = [ [[package]] name = "passkey-transports" version = "0.1.0" -source = "git+https://github.com/bitwarden/passkey-rs?rev=357cc9672340f6ff1f22a0b210a74de64799fa73#357cc9672340f6ff1f22a0b210a74de64799fa73" +source = "git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32#043279e92e2eb5f509bf87eb7fa50987fd377e32" + +[[package]] +name = "passkey-types" +version = "0.5.0" +source = "git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32#043279e92e2eb5f509bf87eb7fa50987fd377e32" +dependencies = [ + "bitflags 2.9.1", + "ciborium", + "coset", + "data-encoding", + "getrandom 0.2.16", + "hmac 0.12.1", + "indexmap 2.12.1", + "rand 0.8.5", + "serde", + "serde_json", + "sha2 0.10.9", + "strum 0.27.2", + "url", + "zeroize", +] [[package]] name = "passkey-types" @@ -3698,7 +3749,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9", - "strum", + "strum 0.25.0", "url", "zeroize", ] @@ -4039,6 +4090,11 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "public-suffix" +version = "0.1.3" +source = "git+https://github.com/bitwarden/passkey-rs?rev=043279e92e2eb5f509bf87eb7fa50987fd377e32#043279e92e2eb5f509bf87eb7fa50987fd377e32" + [[package]] name = "public-suffix" version = "0.1.3" @@ -5173,7 +5229,16 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros", + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros 0.27.2", ] [[package]] @@ -5189,6 +5254,18 @@ dependencies = [ "syn", ] +[[package]] +name = "strum_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "subtle" version = "2.6.1" diff --git a/crates/bitwarden-fido/Cargo.toml b/crates/bitwarden-fido/Cargo.toml index a08abb3cf..1a036d5a3 100644 --- a/crates/bitwarden-fido/Cargo.toml +++ b/crates/bitwarden-fido/Cargo.toml @@ -27,7 +27,7 @@ chrono = { workspace = true } coset = ">=0.3.7, <0.4" itertools = ">=0.13.0, <0.15" p256 = ">=0.13.2, <0.14" -passkey = { git = "https://github.com/bitwarden/passkey-rs", rev = "357cc9672340f6ff1f22a0b210a74de64799fa73" } +passkey = { git = "https://github.com/bitwarden/passkey-rs", rev = "043279e92e2eb5f509bf87eb7fa50987fd377e32" } passkey-client = { git = "https://github.com/bitwarden/passkey-rs", rev = "357cc9672340f6ff1f22a0b210a74de64799fa73", features = [ "android-asset-validation", ] }