diff options
| author | Rob Percival <robpercival@google.com> | 2016-09-12 16:57:38 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-11-15 16:30:14 -0500 |
| commit | 609673d93b8d9d53b687d84afe40b7f30f43adf3 (patch) | |
| tree | 33987fd999180e7d8b0b744ee0bf0550b01d6bdf /crypto/ct | |
| parent | fd7138ddeed4b577c1a37cc58fef6e715753698d (diff) | |
Default CT_POLICY_EVAL_CTX.epoch_time_in_ms to time()
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 e25233d99c30885bdf97bfb6df657e13ca2bf1da)
Diffstat (limited to 'crypto/ct')
| -rw-r--r-- | crypto/ct/ct_policy.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c index 074589db93..d2f72c4a5a 100644 --- a/crypto/ct/ct_policy.c +++ b/crypto/ct/ct_policy.c @@ -13,18 +13,25 @@ #include <openssl/ct.h> #include <openssl/err.h> +#include <time.h> #include "ct_locl.h" CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new(void) { CT_POLICY_EVAL_CTX *ctx = OPENSSL_zalloc(sizeof(CT_POLICY_EVAL_CTX)); + time_t epoch_time_in_s; if (ctx == NULL) { CTerr(CT_F_CT_POLICY_EVAL_CTX_NEW, ERR_R_MALLOC_FAILURE); return NULL; } + // Use the current time if available. + time(&epoch_time_in_s); + if (epoch_time_in_s != -1) + ctx->epoch_time_in_ms = epoch_time_in_s * 1000; + return ctx; } |