diff --git a/Cargo.lock b/Cargo.lock index 6b03747a6..52009746e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1642,6 +1642,7 @@ name = "integration-tests" version = "0.5.0" dependencies = [ "anyhow", + "ciborium", "fdo-data-formats", "fdo-util", "hex", @@ -1654,7 +1655,6 @@ dependencies = [ "regex", "reqwest", "serde", - "serde_cbor", "serde_json", "tempfile", "tera", diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 9290c20f4..17e95b2be 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -18,6 +18,7 @@ path = "tests/to.rs" [dev-dependencies] anyhow = "1" +ciborium = "0.2.0" hex = "0.4" tempfile = "3" tera = "1" @@ -28,7 +29,6 @@ libc = "0.2" reqwest = { version = "0.11", features = ["json"] } tokio = "1.25.0" serde = "1" -serde_cbor = "0.11" serde_json = "1.0" pretty_assertions = "1.0.0" paste = "1.0" diff --git a/integration-tests/tests/to.rs b/integration-tests/tests/to.rs index b0b763885..eeb3dead9 100644 --- a/integration-tests/tests/to.rs +++ b/integration-tests/tests/to.rs @@ -292,7 +292,7 @@ ssh-ed25519 sshkey_default user@example2.com fn determine_device_credential_guid(path: &Path) -> Result { let dc_contents = fs::read(path).context("Error reading device credential")?; - let dc: FileDeviceCredential = - serde_cbor::from_slice(&dc_contents).context("Error deserializing device credential")?; + let dc: FileDeviceCredential = ciborium::de::from_reader(dc_contents.as_slice()) + .context("Error deserializing device credential")?; Ok(dc.guid) }