From: Rob Percival <robpercival@google.com>
Date: Mon, 12 Sep 2016 15:58:29 +0000 (+0100)
Subject: Don't check for time() failing in CT_POLICY_EVAL_CTX_new
X-Git-Tag: OpenSSL_1_1_1-pre1~3060
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f0f535e92b096db4a308ecc49ba7f0fd3f0f7945;p=oweals%2Fopenssl.git

Don't check for time() failing in CT_POLICY_EVAL_CTX_new

See https://github.com/openssl/openssl/pull/1554#issuecomment-246354677.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1554)
---

diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c
index d2f72c4a5a..1bc22749d3 100644
--- a/crypto/ct/ct_policy.c
+++ b/crypto/ct/ct_policy.c
@@ -20,18 +20,14 @@
 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;
-
+    // time(NULL) shouldn't ever fail, so don't bother checking for -1.
+    ctx->epoch_time_in_ms = time(NULL) * 1000;
     return ctx;
 }