From 79424cc60b6577e59c8e7c3840d9ecdab420ebf9 Mon Sep 17 00:00:00 2001 From: Xynnn007 Date: Thu, 10 Jul 2025 14:23:33 +0800 Subject: [PATCH 1/4] chore(deps): update serde_with to 3.14.0 Signed-off-by: Xynnn007 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a89bc30..e2e42f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ jsonwebkey = { version = "0.3.5", features = ["pkcs-convert"] } tokio = { version = "1.43.0", features = ["full"] } [dependencies.serde_with] -version = "3.11.0" +version = "3.14.0" features = ["base64", "chrono"] [dev-dependencies] From a6eb7fe0b196a18973bb0f2ec5493c45388cbb7b Mon Sep 17 00:00:00 2001 From: Xynnn007 Date: Thu, 10 Jul 2025 14:24:22 +0800 Subject: [PATCH 2/4] lint: fix format! macro lint error Signed-off-by: Xynnn007 --- examples/challenge_response.rs | 10 +++++----- src/lib.rs | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/challenge_response.rs b/examples/challenge_response.rs index b9aeb45..40b6cd9 100644 --- a/examples/challenge_response.rs +++ b/examples/challenge_response.rs @@ -10,8 +10,8 @@ fn my_evidence_builder( accept: &[String], token: Vec, ) -> Result<(Vec, String), Error> { - println!("server challenge: {:?}", nonce); - println!("acceptable media types: {:#?}", accept); + println!("server challenge: {nonce:?}"); + println!("acceptable media types: {accept:#?}"); let mut token = token; if token.is_empty() { @@ -45,7 +45,7 @@ async fn main() { .get_api_endpoint("newChallengeResponseSession") .expect("Could not locate a newChallengeResponseSession endpoint"); - let api_endpoint = format!("{}{}", base_url, relative_endpoint); + let api_endpoint = format!("{base_url}{relative_endpoint}"); // create a ChallengeResponse object let cr = ChallengeResponseBuilder::new() @@ -58,7 +58,7 @@ async fn main() { // alternatively, to let Veraison pick the challenge: "let nonce = Nonce::Size(32);" match cr.run(nonce, my_evidence_builder, Vec::new()).await { - Err(e) => println!("Error: {}", e), - Ok(attestation_result) => println!("Attestation Result: {}", attestation_result), + Err(e) => println!("Error: {e}"), + Ok(attestation_result) => println!("Attestation Result: {attestation_result}"), } } diff --git a/src/lib.rs b/src/lib.rs index 493e8b8..48e3fa7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -49,7 +49,7 @@ impl std::fmt::Debug for Error { | Error::ApiError(e) | Error::CallbackError(e) | Error::DataConversionError(e) => { - write!(f, "{}", e) + write!(f, "{e}") } } } @@ -263,8 +263,7 @@ impl ChallengeResponse { Err(Error::NotImplementedError("asynchronous model".to_string())) } status => Err(Error::ApiError(format!( - "session response has unexpected success status: {}", - status, + "session response has unexpected success status: {status}", ))), } } else { From 4dec1f8469221520ada3e5b47199d91e791a33dc Mon Sep 17 00:00:00 2001 From: Xynnn007 Date: Thu, 10 Jul 2025 15:02:17 +0800 Subject: [PATCH 3/4] lint: ignore dead code error Signed-off-by: Xynnn007 --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index 48e3fa7..989644e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -555,6 +555,7 @@ impl Discovery { } } +#[allow(dead_code)] #[derive(serde::Deserialize)] struct ProblemDetails { r#type: String, From 420c8c4030b5d71c4dec2f3f23a5ec5af14c72c5 Mon Sep 17 00:00:00 2001 From: Thomas Fossati Date: Thu, 10 Jul 2025 09:05:07 +0200 Subject: [PATCH 4/4] fix: explicitly allow CDLA-Permissive-2.0 Signed-off-by: Thomas Fossati --- deny.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/deny.toml b/deny.toml index 82a265b..6010bd4 100644 --- a/deny.toml +++ b/deny.toml @@ -107,6 +107,7 @@ allow = [ "MIT", "Apache-2.0", "BSD-3-Clause", + "CDLA-Permissive-2.0", "ISC", "OpenSSL", # Unicode-DFS-2016 is superseded by Unicode-3.0