Skip to content
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
42 changes: 27 additions & 15 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,11 @@ untrusted = "0.9"
base64 = "0.22"
bencher = "0.1.5"
chrono = "0.4"
limbo-harness-support = { git = "https://github.com/C2SP/x509-limbo", rev = "1983423436313a6605461056470e21242d066416" }
limbo-harness-support = { git = "https://github.com/C2SP/x509-limbo", rev = "1252c300df48507fb27e709fb287c01a9caa1e0b" }
once_cell = "1.17.2"
rcgen = { version = "0.14.7", default-features = false, features = ["aws_lc_rs"] }
rustls-aws-lc-rs = { version = "0.1.0-dev.0" }
rustls-aws-lc-rs = { version = "0.1.0-dev.1" }
rustls-post-quantum = { version = "0.3.0-dev.2" }
rustls-ring = { version = "0.1.0-dev.0" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
6 changes: 5 additions & 1 deletion tests/x509_limbo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use limbo_harness_support::LIMBO_JSON;
use limbo_harness_support::models::{ExpectedResult, Feature, Limbo, Testcase, ValidationKind};
use pki_types::pem::PemObject;
use pki_types::{CertificateDer, CertificateRevocationListDer, ServerName, UnixTime};
use rustls_post_quantum::{ML_DSA_44, ML_DSA_65, ML_DSA_87};
use serde::{Deserialize, Serialize};
use webpki::{
EndEntityCert, ExpirationPolicy, ExtendedKeyUsage, OwnedCertRevocationList, PathBuilder,
Expand Down Expand Up @@ -127,6 +128,9 @@ fn run_validation(tc: &Testcase) -> Result<(), String> {
.collect::<Result<Vec<_>, _>>()?;
let crls = crls.iter().collect::<Vec<_>>();

let mut algs = rustls_aws_lc_rs::ALL_VERIFICATION_ALGS.to_vec();
algs.extend_from_slice(&[ML_DSA_44, ML_DSA_65, ML_DSA_87]);

let builder = PathBuilder::new(
&intermediates,
(!crls.is_empty()).then(|| {
Expand All @@ -138,7 +142,7 @@ fn run_validation(tc: &Testcase) -> Result<(), String> {
.build()
}),
&ExtendedKeyUsage::SERVER_AUTH,
rustls_aws_lc_rs::ALL_VERIFICATION_ALGS,
&algs,
&trust_anchors,
);

Expand Down
10 changes: 10 additions & 0 deletions third-party/x509-limbo/exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,16 @@
"actual": "SUCCESS",
"reason": "webpki does not enforce consistency between BasicConstraints.cA and KeyUsage.keyCertSign in trust anchors"
},
"rfc9881::ml-dsa-44-key-agreement": {
"expected": "FAILURE",
"actual": "SUCCESS",
"reason": "webpki does not enforce RFC 9881 requirement that ML-DSA certs not assert keyAgreement key usage"
},
"rfc9881::ml-dsa-44-key-encipherment": {
"expected": "FAILURE",
"actual": "SUCCESS",
"reason": "webpki does not enforce RFC 9881 requirement that ML-DSA certs not assert keyEncipherment key usage"
},
"webpki::aki::root-with-aki-missing-keyidentifier": {
"expected": "FAILURE",
"actual": "SUCCESS",
Expand Down