ctap2-proto: impl AsRef<[u8]> for authenticator::client_pin::PinUvAuthToken

RawSubcommand is de/serialized as a u8 corresponding to its subCommand
number.

Also implements Display for authenticator::credential::management::Error
so that it can be used as the serde error type for RawSubcommand.

Cargo.lock

@@ -2,11 +2,23 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "aes"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+ "zeroize",
+]
+
 [[package]]
 name = "aho-corasick"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
  "memchr",
 ]
@@ -41,6 +53,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -61,15 +79,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
 
 [[package]]
 name = "bounded-integer"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc54ef154ce8654be9ee10ed33106bdfd5bff6ee7735c25a160af2290ea938ab"
+checksum = "78a6932c88f1d2c29533a3b8a5f5a2f84cc19c3339b431677c3160c5c2e6ca85"
 dependencies = [
  "serde",
 ]
@@ -86,6 +113,15 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -100,9 +136,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbc37d37da9e5bce8173f3a41b71d9bf3c674deebbaceacd0ebdabde76efb03"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -138,6 +174,23 @@ dependencies = [
  "half",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.4"
@@ -154,6 +207,26 @@ dependencies = [
  "ciborium-io",
 ]
 
+[[package]]
+name = "cosey"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb743c2c58b69b970e02f5ba7f552f75fcfc8393768e3ae4316e055aabacfdaa"
+dependencies = [
+ "heapless-bytes",
+ "serde",
+ "serde_repr",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "credential-management-proto"
 version = "0.1.0"
@@ -165,24 +238,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
 
 [[package]]
-name = "ctap2-proto"
+name = "crypto-bigint"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctap2-platform"
 version = "0.1.0"
 dependencies = [
- "bounded-integer",
- "coset",
- "fido-common",
- "serde",
- "serde_with",
- "typed-builder",
+ "aes",
+ "cbc",
+ "cosey",
+ "ctap2-proto",
+ "hmac",
+ "p256",
+ "rand",
+ "sha2",
 ]
 
 [[package]]
-name = "ctap2-raw"
+name = "ctap2-proto"
 version = "0.1.0"
 dependencies = [
+ "bounded-integer",
+ "cosey",
  "fido-common",
- "heapless",
+ "flagset",
+ "hex",
  "serde",
+ "serde_with",
+ "typed-builder",
 ]
 
 [[package]]
@@ -242,6 +344,60 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+dependencies = [
+ "der",
+ "digest",
+ "elliptic-curve",
+ "signature",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pkcs8",
+ "rand_core",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.10.0"
@@ -276,34 +432,75 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
 [[package]]
 name = "fido-common"
 version = "0.1.0"
 dependencies = [
- "bitflags 2.3.1",
+ "bitflags 2.3.2",
  "ciborium",
  "coset",
  "serde",
  "serde_with",
 ]
 
+[[package]]
+name = "flagset"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda653ca797810c02f7ca4b804b40b8b95ae046eb989d356bce17919a8c25499"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
 ]
 
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core",
+ "subtle",
+]
+
 [[package]]
 name = "half"
 version = "1.8.2"
@@ -334,11 +531,21 @@ dependencies = [
  "atomic-polyfill",
  "hash32",
  "rustc_version",
- "serde",
  "spin",
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "heapless-bytes"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7285eba272c6af3e9f15fb9e1c1b6e7d35aa70580ffe0d47af017e97dfb6f48b"
+dependencies = [
+ "heapless",
+ "serde",
+ "typenum",
+]
+
 [[package]]
 name = "hermit-abi"
 version = "0.3.1"
@@ -357,12 +564,16 @@ version = "0.1.0"
 dependencies = [
  "ciborium",
  "ciborium-io",
+ "ctap2-platform",
  "ctap2-proto",
  "ctaphid",
  "env_logger",
+ "hex",
  "hidapi",
+ "hmac",
  "rand",
  "serde",
+ "sha2",
 ]
 
 [[package]]
@@ -377,6 +588,24 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "hkdf"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -385,9 +614,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -423,6 +652,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "io-lifetimes"
 version = "1.0.11"
@@ -454,18 +692,18 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "js-sys"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
 [[package]]
 name = "linux-raw-sys"
@@ -475,9 +713,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -485,9 +723,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.18"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "memchr"
@@ -506,9 +744,31 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.2"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
 
 [[package]]
 name = "pkg-config"
@@ -522,11 +782,20 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "primeorder"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.59"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
 dependencies = [
  "unicode-ident",
 ]
@@ -572,9 +841,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.3"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -598,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.19"
+version = "0.37.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -622,6 +891,19 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "sec1"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.17"
@@ -648,15 +930,26 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
 [[package]]
 name = "serde_with"
 version = "2.2.0"
@@ -685,6 +978,27 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -694,6 +1008,15 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "der",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -706,6 +1029,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -745,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.21"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
+checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
 dependencies = [
  "itoa",
  "serde",
@@ -781,12 +1110,24 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -795,9 +1136,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -805,9 +1146,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
@@ -820,9 +1161,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -830,9 +1171,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -843,9 +1184,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.86"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "webauthn3-proto"
@@ -962,3 +1303,9 @@ name = "windows_x86_64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "zeroize"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"

crates/ctap2-proto/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 fido-common = { path = "../fido-common" }
 bounded-integer = { version = "0.5.3", features = ["types", "std"] }
-coset = "0.3.3"
 serde = { version = "=1.0.136", features = ["derive"], optional = true }
 typed-builder = { version = "0.14.0", default-features = false }
 # Version <= to support older serde

crates/ctap2-proto/src/authenticator/client_pin/auth_protocol.rs

@@ -1,7 +1,9 @@
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+use std::marker::ConstParamTy;
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, ConstParamTy)]
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),

crates/ctap2-proto/src/authenticator/client_pin/mod.rs

@@ -10,8 +10,10 @@ pub mod auth_protocol;
 #[cfg(feature = "serde")]
 mod raw;
 
-pub type PinUvAuthParam = [u8; 16];
+#[cfg(feature = "serde")]
+use raw::{RawRequest, RawResponse};
 
+pub type PinUvAuthParam = [u8; 16];
 
 #[derive(Clone, Copy, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
@@ -20,6 +22,15 @@ pub enum PinUvAuthToken {
     Long([u8; 32]),
 }
 
+impl AsRef<[u8]> for PinUvAuthToken {
+    fn as_ref(&self) -> &[u8] {
+        match self {
+            PinUvAuthToken::Short(bytes) => bytes.as_ref(),
+            PinUvAuthToken::Long(bytes) => bytes.as_ref(),
+        }
+    }
+}
+
 #[cfg(feature = "serde")]
 impl TryFrom<&[u8]> for PinUvAuthToken {
     type Error = Error;
@@ -64,6 +75,12 @@ impl SerializeAs<PinUvAuthToken> for Bytes {
         }
     }
 }
+#[derive(Clone, Debug)]
+#[cfg_attr(
+    feature = "serde",
+    derive(Serialize, Deserialize),
+    serde(into = "RawRequest", try_from = "RawRequest")
+)]
 pub enum Request<'a> {
     GetPinRetries,
     GetKeyAgreement {
@@ -103,6 +120,12 @@ pub enum Request<'a> {
     },
 }
 
+#[derive(Clone, Debug)]
+#[cfg_attr(
+    feature = "serde",
+    derive(Serialize, Deserialize),
+    serde(into = "RawResponse", try_from = "RawResponse")
+)]
 pub enum Response {
     GetPinRetries {
         pin_retries: usize,

crates/ctap2-proto/src/authenticator/client_pin/raw/mod.rs

@@ -2,10 +2,17 @@
 //! possible in CBOR format while maintaining ergonomic enum variants for public
 //! API.
 
+use super::auth_protocol;
+use super::Error;
 use super::Permission;
+use super::{PinUvAuthParam, PinUvAuthToken};
+use super::{Request, Response};
 use flagset::flags;
 use flagset::FlagSet;
 use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, Bytes};
+use std::borrow::Cow;
+
 mod public_key;
 
 #[derive(Clone, Serialize, Deserialize)]
@@ -27,6 +34,276 @@ impl From<RawSubcommand> for u8 {
     }
 }
 
+#[serde_as]
+#[derive(Clone, Serialize, Deserialize)]
+pub(crate) struct RawRequest<'a> {
+    #[serde(rename = 0x01, skip_serializing_if = "Option::is_none")]
+    pub pin_uv_auth_protocol: Option<auth_protocol::Version>,
+    #[serde(rename = 0x02)]
+    pub sub_command: RawSubcommand,
+    #[serde(
+        rename = 0x03,
+        deserialize_with = "public_key::deserialize",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub key_agreement: Option<cosey::PublicKey>,
+    #[serde_as(as = "Option<Bytes>")]
+    #[serde(rename = 0x04, skip_serializing_if = "Option::is_none")]
+    pub pin_uv_auth_param: Option<PinUvAuthParam>,
+    #[serde_as(as = "Option<Bytes>")]
+    #[serde(rename = 0x05, skip_serializing_if = "Option::is_none")]
+    pub new_pin_enc: Option<[u8; 64]>,
+    #[serde_as(as = "Option<Bytes>")]
+    #[serde(rename = 0x06, skip_serializing_if = "Option::is_none")]
+    pub pin_hash_enc: Option<[u8; 16]>,
+    #[serde(rename = 0x09, skip_serializing_if = "Option::is_none")]
+    pub permissions: Option<FlagSet<RawPermission>>, // TODO: Deserialize from bitfield
+    #[serde(rename = 0x0A, skip_serializing_if = "Option::is_none")]
+    pub rp_id: Option<Cow<'a, str>>,
+}
+
+impl<'a> From<Request<'a>> for RawRequest<'a> {
+    fn from(value: Request<'a>) -> Self {
+        match value {
+            Request::GetPinRetries => Self {
+                pin_uv_auth_protocol: None,
+                sub_command: RawSubcommand::GetPinRetries,
+                key_agreement: None,
+                pin_uv_auth_param: None,
+                new_pin_enc: None,
+                pin_hash_enc: None,
+                rp_id: None,
+                permissions: None,
+            },
+            Request::GetKeyAgreement { version } => Self {
+                pin_uv_auth_protocol: Some(version),
+                sub_command: RawSubcommand::GetKeyAgreement,
+                key_agreement: None,
+                pin_uv_auth_param: None,
+                new_pin_enc: None,
+                pin_hash_enc: None,
+                rp_id: None,
+                permissions: None,
+            },
+            Request::SetPin {
+                key_agreement,
+                new_pin_encrypted,
+                pin_uv_auth_param,
+                version,
+            } => Self {
+                pin_uv_auth_protocol: Some(version),
+                sub_command: RawSubcommand::SetPin,
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_param: Some(pin_uv_auth_param),
+                new_pin_enc: Some(new_pin_encrypted.clone()),
+                pin_hash_enc: None,
+                rp_id: None,
+                permissions: None,
+            },
+            Request::ChangePin {
+                version,
+                pin_hash_encrypted,
+                new_pin_encrypted,
+                pin_uv_auth_param,
+                key_agreement,
+            } => Self {
+                pin_uv_auth_protocol: Some(version),
+                sub_command: RawSubcommand::ChangePin,
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_param: Some(pin_uv_auth_param),
+                new_pin_enc: Some(new_pin_encrypted.clone()),
+                pin_hash_enc: Some(pin_hash_encrypted.clone()),
+                rp_id: None,
+                permissions: None,
+            },
+            Request::GetPinToken {
+                version,
+                key_agreement,
+                pin_hash_encrypted,
+            } => Self {
+                pin_uv_auth_protocol: Some(version),
+                sub_command: RawSubcommand::GetPinToken,
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_param: None,
+                new_pin_enc: None,
+                pin_hash_enc: Some(pin_hash_encrypted.clone()),
+                rp_id: None,
+                permissions: None,
+            },
+            Request::GetPinUvAuthTokenUsingUvWithPermissions {
+                version,
+                key_agreement,
+                permissions,
+                relying_party_id,
+            } => Self {
+                pin_uv_auth_protocol: Some(version),
+                sub_command: RawSubcommand::GetPinUvAuthTokenUsingUvWithPermissions,
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_param: None,
+                new_pin_enc: None,
+                pin_hash_enc: None,
+                rp_id: relying_party_id,
+                permissions: Some(permissions.iter().map(Clone::clone).collect()),
+            },
+            Request::GetUvRetries => Self {
+                pin_uv_auth_protocol: None,
+                sub_command: RawSubcommand::GetUvRetries,
+                key_agreement: None,
+                pin_uv_auth_param: None,
+                new_pin_enc: None,
+                pin_hash_enc: None,
+                rp_id: None,
+                permissions: None,
+            },
+            Request::GetPinUvAuthTokenUsingPinWithPermissions {
+                version,
+                key_agreement,
+                pin_hash_encrypted,
+                permissions,
+                relying_party_id,
+            } => Self {
+                pin_uv_auth_protocol: Some(version),
+                sub_command: RawSubcommand::GetPinUvAuthTokenUsingPinWithPermissions,
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_param: None,
+                new_pin_enc: None,
+                pin_hash_enc: Some(pin_hash_encrypted),
+                rp_id: relying_party_id,
+                permissions: Some(permissions.iter().map(Clone::clone).collect()),
+            },
+        }
+    }
+}
+
+impl<'a> TryFrom<RawRequest<'a>> for Request<'a> {
+    type Error = Error;
+
+    fn try_from(value: RawRequest<'a>) -> Result<Self, Self::Error> {
+        todo!()
+    }
+}
+
+#[serde_as]
+#[derive(Serialize, Deserialize)]
+pub(crate) struct RawResponse {
+    #[serde(
+        rename = 0x01,
+        default, // Allows for None variant to be deserialized when 0x01 is not present, required
+                 // because of deserialize_with
+        deserialize_with = "public_key::deserialize",
+        skip_serializing_if = "Option::is_none",
+    )]
+    pub key_agreement: Option<cosey::PublicKey>,
+    #[serde_as(as = "Option<Bytes>")]
+    #[serde(rename = 0x02, skip_serializing_if = "Option::is_none")]
+    pub pin_uv_auth_token: Option<PinUvAuthToken>,
+    #[serde(rename = 0x03, skip_serializing_if = "Option::is_none")]
+    pub pin_retries: Option<usize>,
+    #[serde(rename = 0x04, skip_serializing_if = "Option::is_none")]
+    pub power_cycle_state: Option<usize>,
+    #[serde(rename = 0x05, skip_serializing_if = "Option::is_none")]
+    pub uv_retries: Option<usize>,
+}
+
+impl From<Response> for RawResponse {
+    fn from(value: Response) -> Self {
+        match value {
+            Response::GetPinRetries {
+                pin_retries,
+                power_cycle_state,
+            } => Self {
+                key_agreement: None,
+                pin_uv_auth_token: None,
+                pin_retries: Some(pin_retries),
+                power_cycle_state,
+                uv_retries: None,
+            },
+            Response::GetKeyAgreement { key_agreement } => Self {
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_token: None,
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            },
+            Response::SetPin => Self {
+                key_agreement: None,
+                pin_uv_auth_token: None,
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            },
+            Response::ChangePin => Self {
+                key_agreement: None,
+                pin_uv_auth_token: None,
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            },
+            Response::GetPinToken { pin_uv_auth_token } => Self {
+                key_agreement: None,
+                pin_uv_auth_token: Some(pin_uv_auth_token),
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            },
+            Response::GetPinUvAuthTokenUsingUvWithPermissions { pin_uv_auth_token } => Self {
+                key_agreement: None,
+                pin_uv_auth_token: Some(pin_uv_auth_token),
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            },
+            Response::GetUvRetries { uv_retries } => Self {
+                key_agreement: None,
+                pin_uv_auth_token: None,
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: Some(uv_retries.get()),
+            },
+            Response::GetPinUvAuthTokenUsingPinWithPermissions { pin_uv_auth_token } => Self {
+                key_agreement: None,
+                pin_uv_auth_token: Some(pin_uv_auth_token),
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            },
+        }
+    }
+}
+
+impl TryFrom<RawResponse> for Response {
+    type Error = Error;
+
+    fn try_from(value: RawResponse) -> Result<Self, Self::Error> {
+        Ok(match value {
+            RawResponse {
+                key_agreement: None,
+                pin_uv_auth_token: None,
+                pin_retries: Some(pin_retries),
+                power_cycle_state,
+                uv_retries: None,
+            } => Response::GetPinRetries {
+                pin_retries,
+                power_cycle_state,
+            },
+            RawResponse {
+                key_agreement: Some(key_agreement),
+                pin_uv_auth_token: None,
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            } => Response::GetKeyAgreement { key_agreement },
+            RawResponse {
+                key_agreement: None,
+                pin_uv_auth_token: Some(pin_uv_auth_token),
+                pin_retries: None,
+                power_cycle_state: None,
+                uv_retries: None,
+            } => Response::GetPinToken { pin_uv_auth_token },
+            _ => todo!(),
+        })
+    }
+}
 
 flags! {
     #[derive(Serialize, Deserialize)]

crates/ctap2-proto/src/authenticator/credential/management.rs

@@ -1,8 +1,13 @@
 use crate::{authenticator::client_pin, extensions::cred_protect, Sha256Hash};
 use fido_common::credential::public_key;
+use std::fmt::Display;
+
 
 pub type PinUvAuthParam = [u8; 16];
 
+#[cfg(feature = "serde")]
+mod raw;
+
 #[derive(Clone, Copy)]
 pub enum Request<'a> {
     GetCredentialsMetadata {
@@ -106,3 +111,17 @@ pub enum Error {
     NoCredentials,
     KeyStoreFull,
 }
+
+impl Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let message = match self {
+            Error::PinUvAuthTokenRequired => "PIN/UV auth token required",
+            Error::MissingParameter => "Missing parameter",
+            Error::InvalidParameter => "Invalid parameter",
+            Error::PinAuthInvalid => "PIN auth invalid",
+            Error::NoCredentials => "No credentials",
+            Error::KeyStoreFull => "Key store full",
+        };
+        write!(f, "{}", message)
+    }
+}

crates/ctap2-proto/src/authenticator/credential/management/raw.rs

@@ -0,0 +1,37 @@
+use super::Error;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[serde(into = "u8", try_from = "u8")]
+enum RawSubcommand {
+    GetCredsMetadata = 0x01,
+    EnumerateRpsBegin = 0x02,
+    EnumerateRpsGetNextRp = 0x03,
+    EnumerateCredentialsBegin = 0x04,
+    EnumerateCredentialsGetNextCredential = 0x05,
+    DeleteCredential = 0x06,
+    UpdateUserInformation = 0x07,
+}
+
+impl From<RawSubcommand> for u8 {
+    fn from(val: RawSubcommand) -> Self {
+        val as u8
+    }
+}
+
+impl TryFrom<u8> for RawSubcommand {
+    type Error = Error;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        Ok(match value {
+            0x01 => RawSubcommand::GetCredsMetadata,
+            0x02 => RawSubcommand::EnumerateRpsBegin,
+            0x03 => RawSubcommand::EnumerateRpsGetNextRp,
+            0x04 => RawSubcommand::EnumerateCredentialsBegin,
+            0x05 => RawSubcommand::EnumerateCredentialsGetNextCredential,
+            0x06 => RawSubcommand::DeleteCredential,
+            0x07 => RawSubcommand::UpdateUserInformation,
+            _ => return Err(Error::InvalidParameter),
+        })
+    }
+}

crates/ctap2-proto/src/lib.rs

@@ -86,5 +86,5 @@ pub enum Command {
     AuthenticatorLargeBlobs = 0x0C,
     AuthenticatorConfig = 0x0D,
     PrototypeAuthenticatorBioEnrollment = 0x40,
-    PrototypeAuthenticatorCredentialmanagement = 0x41,
+    PrototypeAuthenticatorCredentialManagement = 0x41,
 }

crates/webauthn3-proto/src/client.rs

@@ -1,10 +1,11 @@
 use crate::token;
+use std::marker::ConstParamTy;
 
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(PartialEq, Eq, Clone, Copy)]
+#[derive(PartialEq, Eq, Clone, Copy, ConstParamTy)]
 pub enum DataType {
     #[cfg_attr(feature = "serde", serde(rename = "webauthn.create"))]
     Create,