diff options
| author | Pauli <pauli@openssl.org> | 2022-08-29 14:53:45 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-09-13 21:13:35 +1000 |
| commit | 5d1bb4fc47582b06dd224a788bdfaaced60e72a0 (patch) | |
| tree | 114804c929bb4ecf642752bb186aa42cfe6ebc41 /crypto/ct | |
| parent | 02d0f87a8ba143eaeaee3334a2f63543b10148a9 (diff) | |
libcrypto: remove reliance on struct timeval
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19082)
Diffstat (limited to 'crypto/ct')
| -rw-r--r-- | crypto/ct/ct_policy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c index 80a8baabe1..ad792b740d 100644 --- a/crypto/ct/ct_policy.c +++ b/crypto/ct/ct_policy.c @@ -13,7 +13,7 @@ #include <openssl/ct.h> #include <openssl/err.h> -#include <time.h> +#include "internal/time.h" #include "ct_local.h" @@ -29,6 +29,7 @@ CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq) { CT_POLICY_EVAL_CTX *ctx = OPENSSL_zalloc(sizeof(CT_POLICY_EVAL_CTX)); + OSSL_TIME now; if (ctx == NULL) { ERR_raise(ERR_LIB_CT, ERR_R_MALLOC_FAILURE); @@ -45,9 +46,9 @@ CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx, } } - /* time(NULL) shouldn't ever fail, so don't bother checking for -1. */ - ctx->epoch_time_in_ms = (uint64_t)(time(NULL) + SCT_CLOCK_DRIFT_TOLERANCE) * - 1000; + now = ossl_time_add(ossl_time_now(), + ossl_seconds2time(SCT_CLOCK_DRIFT_TOLERANCE)); + ctx->epoch_time_in_ms = ossl_time2ms(now); return ctx; } |