From f1d453f9a4e597f4fce170b0fa4cfa9244c6d3cc Mon Sep 17 00:00:00 2001 From: James Hodgkinson Date: Thu, 7 Nov 2024 18:35:01 +0900 Subject: [PATCH 1/3] setting msrv to 1.79 --- .github/workflows/ci.yml | 2 +- Cargo.toml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d48e8dc..c57b067 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - rust_version: [stable, 1.70.0] + rust_version: [stable, 1.79.0] os: - ubuntu-latest - windows-latest diff --git a/Cargo.toml b/Cargo.toml index 89c1e88..331067d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "kanidm-hsm-crypto" description = "A library for easily interacting with a HSM or TPM" -version = "0.2.0" +version = "0.2.1" edition = "2021" license = "MPL-2.0" homepage = "https://github.com/kanidm/hsm-crypto/" repository = "https://github.com/kanidm/hsm-crypto/" authors = ["William Brown "] +rust-version = "1.79" [features] # default = ["tpm"] @@ -19,7 +20,9 @@ hex = "0.4.3" openssl = "^0.10.57" serde = { version = "^1.0", features = ["derive"] } tracing = "^0.1.37" -tss-esapi-sys = { version = "0.5.0", optional = true, features = ["generate-bindings"] } +tss-esapi-sys = { version = "0.5.0", optional = true, features = [ + "generate-bindings", +] } tss-esapi = { version = "=8.0.0-alpha", optional = true } # tss-esapi-sys = { path = "../rust-tss-esapi/tss-esapi-sys", optional = true, features = ["generate-bindings"] } @@ -29,5 +32,3 @@ zeroize = "1.6.0" [dev-dependencies] tracing-subscriber = "^0.3.17" - - From b2cfb303a0fc367f14f25c8499cad94a4f16a06e Mon Sep 17 00:00:00 2001 From: James Hodgkinson Date: Thu, 7 Nov 2024 18:36:12 +0900 Subject: [PATCH 2/3] codespell --- CODE_OF_CONDUCT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 81ed5b2..ad75380 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -4,7 +4,7 @@ In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and -expression, level of experience, education, socio-economic status, nationality, +expression, level of experience, education, socioeconomic status, nationality, personal appearance, race, religion, or sexual identity and orientation. ## Our Standards @@ -71,4 +71,4 @@ members of the project’s leadership. This Code of Conduct is adapted from the Contributor Covenant, version 1.4, available at -https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + From 6d069a1ac3ff60d956d81f9c330d9264f7232b88 Mon Sep 17 00:00:00 2001 From: James Hodgkinson Date: Thu, 7 Nov 2024 18:47:05 +0900 Subject: [PATCH 3/3] clippy --- src/soft.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/soft.rs b/src/soft.rs index a9a0513..33c7d8b 100644 --- a/src/soft.rs +++ b/src/soft.rs @@ -445,11 +445,9 @@ impl Tpm for SoftTpm { error!(?ossl_err); TpmError::IdentityKeySignature }) - .map(|sig| { - let res = openssl::ecdsa::EcdsaSig::from_der(&sig); + .inspect(|sig| { + let res = openssl::ecdsa::EcdsaSig::from_der(sig); tracing::debug!(res = %res.is_ok()); - - sig }) }