diff --git a/rustls-platform-verifier/src/tests/mod.rs b/rustls-platform-verifier/src/tests/mod.rs index ba2aa6c1..687993eb 100644 --- a/rustls-platform-verifier/src/tests/mod.rs +++ b/rustls-platform-verifier/src/tests/mod.rs @@ -1,7 +1,6 @@ #[cfg(feature = "ffi-testing")] pub mod ffi; -use std::time::Duration; use std::{error::Error as StdError, sync::Arc}; mod verification_real_world; @@ -56,16 +55,6 @@ pub fn assert_cert_error_eq( } } -/// Return a fixed [`pki_types::UnixTime`] for certificate validation purposes. -/// -/// We fix the "now" value used for certificate validation to a fixed point in time at which -/// we know the test certificates are valid. This must be updated if the mock certificates -/// are regenerated. -pub(crate) fn verification_time() -> pki_types::UnixTime { - // Wed, 12 Aug 2026 10:23 UTC - pki_types::UnixTime::since_unix_epoch(Duration::from_secs(1_786_530_173)) -} - fn test_provider() -> Arc { Arc::new(rustls::crypto::ring::default_provider()) } diff --git a/rustls-platform-verifier/src/tests/verification_mock/mod.rs b/rustls-platform-verifier/src/tests/verification_mock/mod.rs index 98a22e96..83f272dc 100644 --- a/rustls-platform-verifier/src/tests/verification_mock/mod.rs +++ b/rustls-platform-verifier/src/tests/verification_mock/mod.rs @@ -21,6 +21,7 @@ not(target_os = "visionos") ))] +use core::time::Duration; use std::convert::TryFrom; use std::net::IpAddr; #[cfg(not(any(target_vendor = "apple", windows)))] @@ -34,7 +35,7 @@ use rustls::pki_types::{DnsName, ServerName}; use rustls::{CertificateError, Error as TlsError, OtherError}; use super::TestCase; -use crate::tests::{assert_cert_error_eq, test_provider, verification_time}; +use crate::tests::{assert_cert_error_eq, test_provider}; use crate::verification::{EkuError, Verifier}; macro_rules! mock_root_test_cases { @@ -399,3 +400,13 @@ enum Roots { #[cfg(not(target_os = "android"))] ExtraAndPlatform, } + +/// Return a fixed [`pki_types::UnixTime`] for certificate validation purposes. +/// +/// We fix the "now" value used for certificate validation to a fixed point in time at which +/// we know the test certificates are valid. This must be updated if the mock certificates +/// are regenerated. +pub(crate) fn verification_time() -> pki_types::UnixTime { + // Wed, Sep 9 2026 11:52 UTC + pki_types::UnixTime::since_unix_epoch(Duration::from_secs(1_788_954_730)) +} diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.crt index 0968a956..510b3e2c 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.ocsp index 66e49a7e..b55d9b9c 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.ocsp and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-good.ocsp differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.crt index b4f4012e..b113904b 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp index 3b4aa064..a804705e 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-revoked.ocsp differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt index b547d64d..6c522583 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_1-wrong_eku.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt index 70b398f5..bbf745ce 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp index e920cd38..5bdd13cc 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-good.ocsp differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt index 156afaa2..40904cd7 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp index 6dff38ec..d739981b 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-revoked.ocsp differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt index 17bdbc05..9c190311 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_127.0.0.1-wrong_eku.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.crt index 0c2364f4..b7ca8ed2 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp index 028baa2a..4196cc7d 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-good.ocsp differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt index bf6c751a..5c6f7ff5 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp index bbd64a37..20de8ba7 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-revoked.ocsp differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt index e311b4fa..b041eb03 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1-ee_example.com-wrong_eku.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1-int1.crt b/rustls-platform-verifier/src/tests/verification_mock/root1-int1.crt index 7c059e53..4b0bc94d 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1-int1.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1-int1.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_mock/root1.crt b/rustls-platform-verifier/src/tests/verification_mock/root1.crt index 0292e4c6..addcbe34 100644 Binary files a/rustls-platform-verifier/src/tests/verification_mock/root1.crt and b/rustls-platform-verifier/src/tests/verification_mock/root1.crt differ diff --git a/rustls-platform-verifier/src/tests/verification_real_world/mod.rs b/rustls-platform-verifier/src/tests/verification_real_world/mod.rs index bf8d7dab..ea8fb7cc 100644 --- a/rustls-platform-verifier/src/tests/verification_real_world/mod.rs +++ b/rustls-platform-verifier/src/tests/verification_real_world/mod.rs @@ -35,6 +35,8 @@ //! Thus we don't expect these tests to be flaky w.r.t. that, except for //! potentially poor performance. +use core::time::Duration; + use rustls::client::danger::ServerCertVerifier; use rustls::pki_types; #[cfg(not(any(target_vendor = "apple", windows)))] @@ -42,7 +44,7 @@ use rustls::pki_types::{DnsName, ServerName}; use rustls::{CertificateError, Error as TlsError}; use super::TestCase; -use crate::tests::{assert_cert_error_eq, test_provider, verification_time}; +use crate::tests::{assert_cert_error_eq, test_provider}; use crate::Verifier; // This is the certificate chain presented by one server for @@ -276,3 +278,13 @@ real_world_test_cases! { // valid: !cfg!(windows), // }, } + +/// Return a fixed [`pki_types::UnixTime`] for certificate validation purposes. +/// +/// We fix the "now" value used for certificate validation to a fixed point in time at which +/// we know the test certificates are valid. This must be updated if the mock certificates +/// are regenerated. +pub(crate) fn verification_time() -> pki_types::UnixTime { + // Wed, 12 Aug 2026 10:23 UTC + pki_types::UnixTime::since_unix_epoch(Duration::from_secs(1_786_530_173)) +}