openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-24 14:14:37 +00:00
Code Issues Projects Releases Wiki Activity

asn1: merge invalid generalized time tests into invalid time tests

Browse Source 
Previously, invalid generalized time tests were split into a separate
set of test vectors and a flag was used when calling the test function to
indicate they should be tested as generalized only.

This simplifies the code a bit, and makes converting to the new test
framework easier.

ok jsing
This commit is contained in:
joshua
2025-05-22 04:54:14 +00:00
parent 43496798ef
commit f30feaa190
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
regress/lib/libcrypto/asn1/asn1time.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: asn1time.c,v 1.30 2024/07/21 13:25:11 tb Exp $ */
/* $OpenBSD: asn1time.c,v 1.31 2025/05/22 04:54:14 joshua Exp $ */
/*
* Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2024 Google Inc.
@@ -33,6 +33,7 @@ struct asn1_time_test {
const char *data;
const unsigned char der[32];
time_t time;
int generalized_time;
};
static const struct asn1_time_test asn1_invtime_tests[] = {
@@ -73,20 +74,19 @@ static const struct asn1_time_test asn1_invtime_tests[] = {
{
.str = "aaaaaaaaaaaaaaZ",
},
/* utc time with omitted seconds, should fail */
{
/* UTC time with omitted seconds, should fail */
.str = "1609082343Z",
},
};
static const struct asn1_time_test asn1_invgentime_tests[] = {
/* Generalized time with omitted seconds, should fail */
{
/* Generalized time with omitted seconds, should fail */
.str = "201612081934Z",
.generalized_time = 1,
},
/* Valid UTC time, should fail as a generalized time */
{
/* Valid UTC time, should fail as a generalized time */
.str = "160908234300Z",
.generalized_time = 1,
},
};
@@ -235,7 +235,7 @@ asn1_compare_str(int test_no, const struct asn1_string_st *asn1str,
}
static int
asn1_invtime_test(int test_no, const struct asn1_time_test *att, int gen)
asn1_invtime_test(int test_no, const struct asn1_time_test *att)
{
ASN1_GENERALIZEDTIME *gt = NULL;
ASN1_UTCTIME *ut = NULL;
@@ -255,7 +255,7 @@ asn1_invtime_test(int test_no, const struct asn1_time_test *att, int gen)
goto done;
}
if (gen) {
if (att->generalized_time) {
failure = 0;
goto done;
}
@@ -842,13 +842,7 @@ main(int argc, char **argv)
fprintf(stderr, "Invalid time tests...\n");
for (i = 0; i < N_INVTIME_TESTS; i++) {
att = &asn1_invtime_tests[i];
failed |= asn1_invtime_test(i, att, 0);
}
fprintf(stderr, "Invalid generalized time tests...\n");
for (i = 0; i < N_INVGENTIME_TESTS; i++) {
att = &asn1_invgentime_tests[i];
failed |= asn1_invtime_test(i, att, 1);
failed |= asn1_invtime_test(i, att);
}
fprintf(stderr, "GENERALIZEDTIME tests...\n");