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

Author: jalil-salame

Cargo.lock

@@ -12,19 +12,19 @@ keywords.workspace = true
 
 [features]
 default = ["crypto", "pem", "ring"]
-aws_lc_rs = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/aws-lc-sys"]
+aws_lc_rs = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/aws-lc-sys", "x509-parser?/verify-aws"]
 aws_lc_rs_unstable = ["aws_lc_rs", "aws-lc-rs/unstable"]
-fips = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/fips"]
+fips = ["crypto", "dep:aws-lc-rs", "aws-lc-rs/fips", "x509-parser?/verify-aws"]
 crypto = []
-ring = ["crypto", "dep:ring"]
+ring = ["crypto", "dep:ring", "x509-parser?/verify"]
 
 [dependencies]
 aws-lc-rs = { workspace = true, optional = true }
 pem = { workspace = true, optional = true }
 pki-types = { workspace = true }
 ring = { workspace = true, optional = true }
 time = { workspace = true }
-x509-parser = { workspace = true, features = ["verify"], optional = true }
+x509-parser = { workspace = true, optional = true }
 yasna = { workspace = true }
 zeroize = { workspace = true, optional = true }
 

rcgen/Cargo.toml

@@ -94,7 +94,7 @@ impl CertificateSigningRequestParams {
 	/// into [`CertificateSigningRequestDer`] using the [`Into`] trait.
 	///
 	/// [`rustls_pemfile::csr()`]: https://docs.rs/rustls-pemfile/latest/rustls_pemfile/fn.csr.html
-	#[cfg(feature = "x509-parser")]
+	#[cfg(all(feature = "x509-parser", feature = "crypto"))]
 	pub fn from_der(csr: &CertificateSigningRequestDer<'_>) -> Result<Self, Error> {
 		use crate::KeyUsagePurpose;
 		use x509_parser::prelude::FromDer;

rcgen/src/csr.rs

@@ -12,10 +12,10 @@ keywords.workspace = true
 
 [features]
 default = ["ring"]
-aws_lc_rs = ["dep:aws-lc-rs", "rcgen/aws_lc_rs", "aws-lc-rs/aws-lc-sys"]
+aws_lc_rs = ["dep:aws-lc-rs", "rcgen/aws_lc_rs", "aws-lc-rs/aws-lc-sys", "x509-parser/verify-aws"]
 aws_lc_rs_unstable = ["rcgen/aws_lc_rs_unstable"]
-fips = ["dep:aws-lc-rs", "rcgen/aws_lc_rs", "aws-lc-rs/fips"]
-ring = ["dep:ring", "rcgen/ring"]
+fips = ["dep:aws-lc-rs", "rcgen/aws_lc_rs", "aws-lc-rs/fips", "x509-parser/verify-aws"]
+ring = ["dep:ring", "rcgen/ring", "x509-parser/verify"]
 
 [dependencies]
 anyhow = { workspace = true }
@@ -28,4 +28,4 @@ ring = { workspace = true, optional = true }
 
 [dev-dependencies]
 assert_fs = { workspace = true }
-x509-parser = { workspace = true, features = ["verify"] }
+x509-parser = { workspace = true }