summaryrefslogtreecommitdiffstats
path: root/crypto/ct
diff options
context:
space:
mode:
authorRob Percival <robpercival@google.com>2016-09-14 20:25:01 +0100
committerRich Salz <rsalz@openssl.org>2016-11-15 16:31:40 -0500
commitaf8852e9957ce00c44653a73ba2f3e332b493c52 (patch)
tree9625bc6deb64f6cf878e3cc4ec7ad2a3005d2bba /crypto/ct
parent81d5808064949e6f23c1eaac4b24f09c8b1255db (diff)
Cast time_t to uint64_t before converting to milliseconds in ct_policy.c
Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1554) (cherry picked from commit 5e08606619c0b0e065f1ffa12ce6411f321ed174)
Diffstat (limited to 'crypto/ct')
-rw-r--r--crypto/ct/ct_policy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c
index adee331366..0f27443971 100644
--- a/crypto/ct/ct_policy.c
+++ b/crypto/ct/ct_policy.c
@@ -33,7 +33,9 @@ CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new(void)
}
// time(NULL) shouldn't ever fail, so don't bother checking for -1.
- ctx->epoch_time_in_ms = (time(NULL) + SCT_CLOCK_DRIFT_TOLERANCE) * 1000;
+ ctx->epoch_time_in_ms = (uint64_t)(time(NULL) + SCT_CLOCK_DRIFT_TOLERANCE) *
+ 1000;
+
return ctx;
}