diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2019-11-22 13:02:52 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-12-04 16:17:55 +0100 |
| commit | 25d7cd1d69e5d5df9c9f346922a48797baca03b7 (patch) | |
| tree | 7c60c618d7e22dc13cb6a7a270fccb50aa3a394c /test/x509_time_test.c | |
| parent | util/mkerr.pl: don't stop reading conserved symbols from the state file (diff) | |
| download | openssl-25d7cd1d69e5d5df9c9f346922a48797baca03b7.tar.xz openssl-25d7cd1d69e5d5df9c9f346922a48797baca03b7.zip | |
add X509_cmp_timeframe() including its documentation
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10502)
Diffstat (limited to 'test/x509_time_test.c')
| -rw-r--r-- | test/x509_time_test.c | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/test/x509_time_test.c b/test/x509_time_test.c index 79c23cf5b3..8e813cb0f9 100644 --- a/test/x509_time_test.c +++ b/test/x509_time_test.c @@ -297,6 +297,56 @@ static int test_x509_cmp_time_current(void) return failed == 0; } +static int test_X509_cmp_timeframe_vpm(const X509_VERIFY_PARAM *vpm, + ASN1_TIME *asn1_before, + ASN1_TIME *asn1_mid, + ASN1_TIME *asn1_after) +{ + int always_0 = vpm != NULL + && (X509_VERIFY_PARAM_get_flags(vpm) & X509_V_FLAG_USE_CHECK_TIME) == 0 + && (X509_VERIFY_PARAM_get_flags(vpm) & X509_V_FLAG_NO_CHECK_TIME) != 0; + + return asn1_before != NULL && asn1_mid != NULL && asn1_after != NULL + && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_before, asn1_after), 0) + && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_before, NULL), 0) + && TEST_int_eq(X509_cmp_timeframe(vpm, NULL, asn1_after), 0) + && TEST_int_eq(X509_cmp_timeframe(vpm, NULL, NULL), 0) + && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_after, asn1_after), + always_0 ? 0 : -1) + && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_before, asn1_before), + always_0 ? 0 : 1) + && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_after, asn1_before), + always_0 ? 0 : 1); +} + +static int test_X509_cmp_timeframe(void) +{ + time_t now = time(NULL); + ASN1_TIME *asn1_mid = ASN1_TIME_adj(NULL, now, 0, 0); + /* Pick a day earlier and later, relative to any system clock. */ + ASN1_TIME *asn1_before = ASN1_TIME_adj(NULL, now, -1, 0); + ASN1_TIME *asn1_after = ASN1_TIME_adj(NULL, now, 1, 0); + X509_VERIFY_PARAM *vpm = X509_VERIFY_PARAM_new(); + int res; + + res = vpm != NULL + && test_X509_cmp_timeframe_vpm(NULL, asn1_before, asn1_mid, asn1_after) + && test_X509_cmp_timeframe_vpm(vpm, asn1_before, asn1_mid, asn1_after); + + X509_VERIFY_PARAM_set_time(vpm, now); + res = res + && test_X509_cmp_timeframe_vpm(vpm, asn1_before, asn1_mid, asn1_after) + && X509_VERIFY_PARAM_set_flags(vpm, X509_V_FLAG_NO_CHECK_TIME) + && test_X509_cmp_timeframe_vpm(vpm, asn1_before, asn1_mid, asn1_after); + + X509_VERIFY_PARAM_free(vpm); + ASN1_TIME_free(asn1_mid); + ASN1_TIME_free(asn1_before); + ASN1_TIME_free(asn1_after); + + return res; +} + static int test_x509_time(int idx) { ASN1_TIME *t = NULL; @@ -485,6 +535,7 @@ static int test_x509_time_print(int idx) int setup_tests(void) { ADD_TEST(test_x509_cmp_time_current); + ADD_TEST(test_X509_cmp_timeframe); ADD_ALL_TESTS(test_x509_cmp_time, OSSL_NELEM(x509_cmp_tests)); ADD_ALL_TESTS(test_x509_time, OSSL_NELEM(x509_format_tests)); ADD_ALL_TESTS(test_days, OSSL_NELEM(day_of_week_tests)); |