Skip to content

Commit 0231671

Browse files
Merge pull request #697 from tgonzalezorlandoarm/tg/update-cryptoki
Update cryptoki and cryptoki-sys crates
2 parents cf6864f + 8319b4b commit 0231671

File tree

13 files changed

+2683
-407
lines changed

13 files changed

+2683
-407
lines changed

Cargo.lock

Lines changed: 328 additions & 351 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ toml = "0.5.8"
2525
serde = { version = "1.0.123", features = ["derive"] }
2626
env_logger = "0.8.3"
2727
log = { version = "0.4.14", features = ["serde"] }
28-
cryptoki = { version = "0.3.1", optional = true, features = ["psa-crypto-conversions"] }
28+
cryptoki = { version = "0.6.0", optional = true, default-features = false }
2929
picky-asn1-der = { version = "0.4.0", optional = true }
3030
picky-asn1 = { version = "0.8.0", optional = true }
3131
tss-esapi = { version = "7.3.0", optional = true }

e2e_tests/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
target
2-
Cargo.lock
3-
provider_cfg/tmp_config.toml
2+
provider_cfg/tmp_config.toml

0 commit comments

Comments
 (0)