Skip to content

Fix time-sensitive certificate test #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bifurcation merged 4 commits into from
Apr 11, 2026
Merged

Fix time-sensitive certificate test #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9eb5c10
Fix time-sensitive certificate test
bifurcation Apr 10, 2026
5a165cb
Add missing #include <functional> to crypto.h
bifurcation Apr 10, 2026
c81faf3
Fix PQ cipher suite preprocessor guard typo
bifurcation Apr 10, 2026
591d1d0
Fix interop code to use all_supported_cipher_suites
bifurcation Apr 10, 2026
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
18 changes: 9 additions & 9 deletions cmd/interop/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::crypto_basics: {
auto cases = std::vector<CryptoBasicsTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite);
}

Expand All @@ -59,7 +59,7 @@ make_test_vector(uint64_t type)
auto cases = std::vector<SecretTreeTestVector>();
auto generations = std::vector<uint32_t>{ 1, 15 };

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite, 15, generations);
}

Expand All @@ -69,7 +69,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::message_protection: {
auto cases = std::vector<MessageProtectionTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite);
}

Expand All @@ -79,7 +79,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::key_schedule: {
auto cases = std::vector<KeyScheduleTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite, n);
}

Expand All @@ -89,7 +89,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::pre_shared_keys: {
auto cases = std::vector<PSKSecretTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite, 5);
}

Expand All @@ -99,7 +99,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::tree_validation: {
auto cases = std::vector<TreeHashTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
for (const auto& tree_structure : all_tree_structures) {
cases.emplace_back(suite, tree_structure);
}
Expand All @@ -111,7 +111,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::transcript_hash: {
auto cases = std::vector<TranscriptTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite);
}

Expand All @@ -121,7 +121,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::welcome: {
auto cases = std::vector<WelcomeTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
cases.emplace_back(suite);
}

Expand All @@ -143,7 +143,7 @@ make_test_vector(uint64_t type)
case TestVectorClass::treekem: {
auto cases = std::vector<TreeKEMTestVector>();

for (const auto& suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto& suite : MLS_NAMESPACE::all_supported_cipher_suites) {
for (const auto& tree_structure : treekem_test_tree_structures) {
cases.emplace_back(suite, tree_structure);
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/interop/src/mls_client_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ MLSClientImpl::SupportedCiphersuites(
SupportedCiphersuitesResponse* reply)
{
reply->clear_ciphersuites();
for (const auto suite : MLS_NAMESPACE::all_supported_suites) {
for (const auto suite : MLS_NAMESPACE::all_supported_cipher_suites) {
reply->add_ciphersuites(static_cast<uint32_t>(suite));
}
return Status::OK;
Expand Down
1 change: 1 addition & 0 deletions include/mls/crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include <functional>
#include <hpke/digest.h>
#include <hpke/hpke.h>
#include <hpke/random.h>
Expand Down
22 changes: 11 additions & 11 deletions lib/hpke/test/certificate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,18 +601,18 @@ TEST_CASE("Test Subject Parsing")

TEST_CASE("Test Certificate notBefore status")
{
// notBefore - 99 years from 04/22/2021
// Certificate with notBefore = 2099-01-01, notAfter = 2126-03-17
const auto root_der = from_hex(
"3082016230820114a00302010202101dcfbd024e5f62ccfb04a1f32e7ce755300506032b65"
"70302a311530130603550403130c637573746f6d3a31323334353111300f06035504051308"
"31312d32322d33333020170d3236303330383036333631345a180f32313235303231323036"
"333631345a302a311530130603550403130c637573746f6d3a31323334353111300f060355"
"0405130831312d32322d3333302a300506032b6570032100cb6d233470f884eaa6e5a3b958"
"e7e68eff3fee146432ea526128171a33f8a403a34e304c300e0603551d0f0101ff04040302"
"02a4300f0603551d130101ff040530030101ff300d0603551d0e0406040459e6b3dd301a06"
"03551d1104133011810f7573657240646f6d61696e2e636f6d300506032b6570034100308a"
"a37cfbcd06e19b7a0728c5c970b38df5eb93d478970868ce6398a6a963b2c570edfd9dc62f"
"4d134de11eca367f9d967d6eae14192454770a2fc278963602");
"3082016d3082011fa00302010202146917699f8fd719f5fa278b5ef781f273ecf9a79f3005"
"06032b6570302a3115301306035504030c0c637573746f6d3a31323334353111300f060355"
"0405130831312d32322d33333022180f32303939303130313030303030305a180f32313236"
"303331373139313035345a302a3115301306035504030c0c637573746f6d3a313233343531"
"11300f0603550405130831312d32322d3333302a300506032b6570032100cff799e44f092c"
"6c5c38f4b23d219846ef7012991e47e017cf01cfba00e91099a3533051301d0603551d0e04"
"160414638dd9f850dd78584ab3b5460bf3e410f591f88b301f0603551d2304183016801463"
"8dd9f850dd78584ab3b5460bf3e410f591f88b300f0603551d130101ff040530030101ff30"
"0506032b6570034100b98e4d86a77bce3820490b506eef20eb41c7bcfe3c7dff300d456760"
"66ae8abb96185ef0b220e12ec192cfc023c3e25a99cc1b0b010fcfbd391cd4dd7b00ec01");

auto root = Certificate{ root_der };
REQUIRE(root.expiration_status() == Certificate::ExpirationStatus::inactive);
Expand Down
2 changes: 1 addition & 1 deletion src/crypto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ CipherSuite::get() const
return ciphers_X448_CHACHA20POLY1305_SHA512_Ed448;
#endif

#if !defined(P256_SHA256)
#if defined(WITH_PQ)
case ID::MLKEM768X25519_AES256GCM_SHA384_Ed25519:
return ciphers_MLKEM768X25519_AES256GCM_SHA384_Ed25519;

Expand Down
Loading