Skip to content

Commit

Permalink
Prefer aws-lc-rs over ring if both are enabled (rustls#252)
Browse files Browse the repository at this point in the history
Fixes rustls#243.
  • Loading branch information
djc authored and Abdullah Alyan committed Mar 27, 2024
1 parent cc282ad commit 9cc7e9c
Show file tree
Hide file tree
Showing 12 changed files with 258 additions and 93 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"
[workspace.dependencies]
aws-lc-rs = "1.6.0"
pem = "3.0.2"
pki-types = { package = "rustls-pki-types", version = "1.3.0" }
pki-types = { package = "rustls-pki-types", version = "1.4.1" }
rand = "0.8"
ring = "0.17"
x509-parser = "0.16"
Expand Down
3 changes: 1 addition & 2 deletions rcgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ required-features = ["pem", "x509-parser"]

[[example]]
name = "simple"
required-features = ["crypto"]
required-features = ["crypto", "pem"]

[dependencies]
aws-lc-rs = { workspace = true, optional = true }
Expand All @@ -42,7 +42,6 @@ aws_lc_rs = ["crypto", "dep:aws-lc-rs"]
ring = ["crypto", "dep:ring"]
fips = ["aws_lc_rs", "aws-lc-rs?/fips"]


[package.metadata.docs.rs]
features = ["x509-parser"]

Expand Down

0 comments on commit 9cc7e9c

Please sign in to comment.