diff --git a/.gitmodules b/.gitmodules index c5fe319..120a69f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "solo/src/ext"] path = solo/src/ext url = https://github.com/AlfioEmanueleFresta/solo.git -[submodule "cosey"] - path = cosey - url = https://github.com/AlfioEmanueleFresta/cosey.git diff --git a/Cargo.lock b/Cargo.lock index e4f83f9..df5162e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -255,18 +255,6 @@ dependencies = [ "cipher", ] -[[package]] -name = "cbor-smol" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2529cc8240fcc91e8642754ce85e5360c2ee7f4435a76aa150e4ed746a5da4" -dependencies = [ - "delog", - "heapless", - "heapless-bytes", - "serde", -] - [[package]] name = "cbor-smol" version = "0.5.0" @@ -330,33 +318,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" -[[package]] -name = "ciborium" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" - -[[package]] -name = "ciborium-ll" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" -dependencies = [ - "ciborium-io", - "half 2.4.1", -] - [[package]] name = "cipher" version = "0.4.4" @@ -398,23 +359,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cosey" -version = "0.3.1" -dependencies = [ - "cbor-smol 0.4.1", - "ciborium", - "heapless-bytes", - "hex 0.4.3", - "itertools 0.12.1", - "quickcheck", - "serde", - "serde_repr", -] - -[[package]] -name = "cosey" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39323fe531b92e7acad90b8550b58cec63d29a6c5a56e02de4b25b6aeedbf82e" +checksum = "75494895fa1a9713ca725ddf2db084ee84fb0c20938fdd7c89293febe732d30a" dependencies = [ "heapless-bytes", "serde", @@ -447,12 +394,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "crunchy" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" - [[package]] name = "crypto-bigint" version = "0.5.5" @@ -482,8 +423,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1beeb5a05e42c7cbfb788ce3e9fd6ce7d0aa214893b5ca6cd38d09ac9afe722" dependencies = [ "bitflags 1.3.2", - "cbor-smol 0.5.0", - "cosey 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cbor-smol", + "cosey", "delog", "heapless", "heapless-bytes", @@ -690,16 +631,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "log", - "regex", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -902,16 +833,6 @@ version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if 1.0.0", - "crunchy", -] - [[package]] name = "hash32" version = "0.2.1" @@ -1222,15 +1143,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.14" @@ -1655,7 +1567,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.5", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -1721,17 +1633,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "env_logger 0.8.4", - "log", - "rand", -] - [[package]] name = "quote" version = "1.0.38" @@ -2020,7 +1921,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half 1.8.3", + "half", "serde", ] @@ -2160,7 +2061,7 @@ dependencies = [ name = "solo" version = "0.1.0" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", "tokio", ] @@ -2818,7 +2719,7 @@ dependencies = [ "blurz", "byteorder", "cbc", - "cosey 0.3.1", + "cosey", "ctap-types", "curve25519-dalek", "dbus 0.9.7", diff --git a/cosey b/cosey deleted file mode 160000 index 3d30a03..0000000 --- a/cosey +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3d30a03abc7c7a4f501f46727fbe2396233fc94a diff --git a/libwebauthn/Cargo.toml b/libwebauthn/Cargo.toml index 26b1a8d..fd2666f 100644 --- a/libwebauthn/Cargo.toml +++ b/libwebauthn/Cargo.toml @@ -48,7 +48,7 @@ bitflags = "2.4.1" rand = "0.8.4" p256 = { version = "0.13.2", features = ["ecdh", "arithmetic", "serde"] } heapless = "0.7" -# cosey = "0.3.0" +cosey = "0.3.2" aes = "0.8.2" hmac = "0.12.1" cbc = { version = "0.1", features = ["alloc"] } @@ -61,7 +61,6 @@ tokio-tungstenite = { version = "0.20.1", features = [ ] } tokio-stream = "0.1.4" snow = { version = "0.10.0-alpha.1", features = ["use-p256"] } -cosey = { path = "../cosey" } ctap-types = { version = "0.3.2" } [dev-dependencies]