Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setting msrv to 1.79, bumping version #37

Merged
merged 3 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
<https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"]
rust-version = "1.79"

[features]
# default = ["tpm"]
Expand All @@ -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"] }
Expand All @@ -29,5 +32,3 @@ zeroize = "1.6.0"

[dev-dependencies]
tracing-subscriber = "^0.3.17"


6 changes: 2 additions & 4 deletions src/soft.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
}

Expand Down
Loading