The branch master has been updated
via 98c03302fb7b855647aa14022f61f5fb272e514a (commit)
from c4eec78d221c6aa8d96d4d0ea9e7525490ffe222 (commit)
- Log -----------------------------------------------------------------
commit 98c03302fb7b855647aa14022f61f5fb272e514a
Author: Miroslav Suk <[email protected]>
Date: Thu Mar 22 09:20:43 2018 +0100
o_time.c: use gmtime_s with MSVC
ts/ts_rsp_sign.c: change to OPENSSL_gmtime.
Reviewed-by: Andy Polyakov <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5720)
-----------------------------------------------------------------------
Summary of changes:
crypto/o_time.c | 4 ++++
crypto/ts/ts_rsp_sign.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/crypto/o_time.c b/crypto/o_time.c
index b2fb38a..30b8155 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -41,6 +41,10 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm
*result)
if (gmtime_r(timer, result) == NULL)
return NULL;
ts = result;
+#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
+ if (gmtime_s(result, timer))
+ return NULL;
+ ts = result;
#else
ts = gmtime(timer);
if (ts == NULL)
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index eac40ab..ed45c00 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -13,6 +13,7 @@
#include <openssl/objects.h>
#include <openssl/ts.h>
#include <openssl/pkcs7.h>
+#include <openssl/crypto.h>
#include "ts_lcl.h"
static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
@@ -986,7 +987,7 @@ static ASN1_GENERALIZEDTIME
*TS_RESP_set_genTime_with_precision(
unsigned precision)
{
time_t time_sec = (time_t)sec;
- struct tm *tm = NULL;
+ struct tm *tm = NULL, tm_result;
char genTime_str[17 + TS_MAX_CLOCK_PRECISION_DIGITS];
char *p = genTime_str;
char *p_end = genTime_str + sizeof(genTime_str);
@@ -994,7 +995,7 @@ static ASN1_GENERALIZEDTIME
*TS_RESP_set_genTime_with_precision(
if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
goto err;
- if ((tm = gmtime(&time_sec)) == NULL)
+ if ((tm = OPENSSL_gmtime(&time_sec, &tm_result)) == NULL)
goto err;
/*
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
