Skip to content

Commit 6bbefe3

Browse files
committed
fix(features): enable x509-parser/verify-aws if aws_lc_rs is selected
Otherwise we pull in `ring` and `aws-lc-rs`. This is broken until a new release of x509-parser with this fix: rusticata/x509-parser@b7dcc93 Signed-off-by: Jalil David Salamé Messina <[email protected]> Change-Id: I6a6a69645257dc0e894279ced2408ec9df61a9d6
1 parent 6447e1f commit 6bbefe3

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

Cargo.lock

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

rcgen/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ keywords.workspace = true
1212

1313
[features]
1414
default = ["crypto", "pem", "ring"]
15-
aws_lc_rs = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/aws-lc-sys"]
15+
aws_lc_rs = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/aws-lc-sys", "x509-parser?/verify-aws"]
1616
aws_lc_rs_unstable = ["aws_lc_rs", "aws-lc-rs/unstable"]
17-
fips = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/fips"]
17+
fips = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/fips", "x509-parser?/verify-aws"]
1818
crypto = []
19-
ring = ["crypto", "dep:ring"]
19+
ring = ["crypto", "dep:ring", "x509-parser?/verify"]
2020

2121
[dependencies]
2222
aws-lc-rs = { workspace = true, optional = true }
2323
pem = { workspace = true, optional = true }
2424
pki-types = { workspace = true }
2525
ring = { workspace = true, optional = true }
2626
time = { workspace = true }
27-
x509-parser = { workspace = true, features = ["verify"], optional = true }
27+
x509-parser = { workspace = true, optional = true }
2828
yasna = { workspace = true }
2929
zeroize = { workspace = true, optional = true }
3030

rcgen/src/csr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl CertificateSigningRequestParams {
9494
/// into [`CertificateSigningRequestDer`] using the [`Into`] trait.
9595
///
9696
/// [`rustls_pemfile::csr()`]: https://docs.rs/rustls-pemfile/latest/rustls_pemfile/fn.csr.html
97-
#[cfg(feature = "x509-parser")]
97+
#[cfg(all(feature = "x509-parser", feature = "crypto"))]
9898
pub fn from_der(csr: &CertificateSigningRequestDer<'_>) -> Result<Self, Error> {
9999
use crate::KeyUsagePurpose;
100100
use x509_parser::prelude::FromDer;

0 commit comments

Comments
 (0)