X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=test%2Fx509_time_test.c;h=41a88ec069b1097512ae66105c06fbb775f3c2bc;hb=2de64666a07cccf8477e6483de62ae31f463df64;hp=d86312646dcb36a893898a6474fcd2e3888f868a;hpb=1a68e5b0d9cf502de0d6c3701bbd5c6cb1aa7b73;p=openssl.git diff --git a/test/x509_time_test.c b/test/x509_time_test.c index d86312646d..41a88ec069 100644 --- a/test/x509_time_test.c +++ b/test/x509_time_test.c @@ -1,7 +1,7 @@ /* - * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html @@ -15,7 +15,7 @@ #include #include #include "testutil.h" -#include "e_os.h" +#include "internal/nelem.h" typedef struct { const char *data; @@ -273,7 +273,7 @@ static int test_x509_cmp_time(int idx) return 1; } -static int test_x509_cmp_time_current() +static int test_x509_cmp_time_current(void) { time_t now = time(NULL); /* Pick a day earlier and later, relative to any system clock. */ @@ -297,6 +297,58 @@ static int test_x509_cmp_time_current() 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 = 0; + + if (vpm == NULL) + goto finish; + res = 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); +finish: + 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; @@ -424,10 +476,71 @@ static int test_days(int n) return r; } -void register_tests() +#define construct_asn1_time(s, t, e) \ + { { sizeof(s) - 1, t, (unsigned char*)s, 0 }, e } + +static const struct { + ASN1_TIME asn1; + const char *readable; +} x509_print_tests [] = { + /* Generalized Time */ + construct_asn1_time("20170731222050Z", V_ASN1_GENERALIZEDTIME, + "Jul 31 22:20:50 2017 GMT"), + /* Generalized Time, no seconds */ + construct_asn1_time("201707312220Z", V_ASN1_GENERALIZEDTIME, + "Jul 31 22:20:00 2017 GMT"), + /* Generalized Time, fractional seconds (3 digits) */ + construct_asn1_time("20170731222050.123Z", V_ASN1_GENERALIZEDTIME, + "Jul 31 22:20:50.123 2017 GMT"), + /* Generalized Time, fractional seconds (1 digit) */ + construct_asn1_time("20170731222050.1Z", V_ASN1_GENERALIZEDTIME, + "Jul 31 22:20:50.1 2017 GMT"), + /* Generalized Time, fractional seconds (0 digit) */ + construct_asn1_time("20170731222050.Z", V_ASN1_GENERALIZEDTIME, + "Bad time value"), + /* UTC Time */ + construct_asn1_time("170731222050Z", V_ASN1_UTCTIME, + "Jul 31 22:20:50 2017 GMT"), + /* UTC Time, no seconds */ + construct_asn1_time("1707312220Z", V_ASN1_UTCTIME, + "Jul 31 22:20:00 2017 GMT"), +}; + +static int test_x509_time_print(int idx) +{ + BIO *m; + int ret = 0, rv; + char *pp; + const char *readable; + + if (!TEST_ptr(m = BIO_new(BIO_s_mem()))) + goto err; + + rv = ASN1_TIME_print(m, &x509_print_tests[idx].asn1); + readable = x509_print_tests[idx].readable; + + if (rv == 0 && !TEST_str_eq(readable, "Bad time value")) { + /* only if the test case intends to fail... */ + goto err; + } + if (!TEST_int_ne(rv = BIO_get_mem_data(m, &pp), 0) + || !TEST_int_eq(rv, (int)strlen(readable)) + || !TEST_strn_eq(pp, readable, rv)) + goto err; + + ret = 1; + err: + BIO_free(m); + return ret; +} + +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)); + ADD_ALL_TESTS(test_x509_time_print, OSSL_NELEM(x509_print_tests)); + return 1; }