mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-18 18:15:34 +00:00
Merge pull request #7795 from storytold/fix/shared-ocsp-wrapper-pin-20261118
fix(sign): consume standard OCSP certificate wrapper parsing
This commit is contained in:
1 parent
dbf59f410f
commit
b11d37c0ed
3 files changed
+26
-2
No files matched your search
Generated
+1
-1
@@ -1384,7 +1384,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-pkcs7"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=a1ad315403a815a07ebfbad2f2e3f90726bb4504#a1ad315403a815a07ebfbad2f2e3f90726bb4504"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=bc4aae37bb219049596327fca971046dab0b78be#bc4aae37bb219049596327fca971046dab0b78be"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"aws-lc-rs",
|
||||
|
||||
@@ -12,7 +12,7 @@ workspace = true
|
||||
|
||||
[dependencies]
|
||||
# Existing shared ASN.1 codec; PDF signature policy remains local.
|
||||
craft-pkcs7 = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "a1ad315403a815a07ebfbad2f2e3f90726bb4504" }
|
||||
craft-pkcs7 = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "bc4aae37bb219049596327fca971046dab0b78be" }
|
||||
pdfcraft-cos = { workspace = true }
|
||||
pdfcraft-annot = { workspace = true }
|
||||
pdfcraft-content = { workspace = true }
|
||||
|
||||
@@ -395,6 +395,30 @@ mod shared_ocsp_tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn standard_certificate_wrapper_intentionally_improves_on_legacy() -> Result<(), SignError> {
|
||||
let date = Time { year: 2026, month: 6, day: 15, hour: 12, minute: 0, second: 0 };
|
||||
let cert = crate::pkcs12::open(include_bytes!("../tests/data/ec-p256.p12"), "test")?.certificate;
|
||||
let hash = DigestAlg::Sha256;
|
||||
let id = der::seq(&[&hash.algorithm(), &der::octets(&[1]), &der::octets(&[2]), &der::uint(&[0x80])]);
|
||||
let single = der::seq(&[&id, &der::tlv(tag::ctx_prim(0), &[]), &date.encode()]);
|
||||
let identity = der::tlv(tag::ctx(1), &cert.subject.raw);
|
||||
let tbs = der::seq(&[&identity, &date.encode(), &der::seq(&[&single])]);
|
||||
let basic = der::seq(&[&tbs, &hash.algorithm(), &der::bit_string(&[1, 2, 3]), &der::explicit(0, &der::seq(&[&cert.raw]))]);
|
||||
let response =
|
||||
der::seq(&[&der::tlv(tag::ENUMERATED, &[0]), &der::explicit(0, &der::seq(&[&der::oid(ID_PKIX_OCSP_BASIC), &der::octets(&basic)]))]);
|
||||
let parsed = OcspResponse::parse(&response)?;
|
||||
let legacy = OcspResponse::parse_legacy(&response)?;
|
||||
// Deliberate correction from shared #2245: the frozen oracle dropped the RFC 6960
|
||||
// SEQUENCE OF wrapper. Keep that baseline unchanged rather than hiding the difference.
|
||||
assert_eq!(parsed.responder_cert.as_ref(), Some(&cert));
|
||||
assert!(legacy.responder_cert.is_none());
|
||||
assert_eq!(parsed.responses, legacy.responses);
|
||||
// Finding a certificate must not make this fabricated response trusted.
|
||||
assert_eq!(parsed.check(&cert, &cert, date), RevocationStatus::Unknown);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_ocsp_matches_status_digest_identity_and_error_policy() {
|
||||
let date = Time { year: 2026, month: 6, day: 15, hour: 12, minute: 0, second: 0 };
|
||||
|
||||
Reference in new issue
Block a user