QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-13 09:59:40 +00:00
Code Issues Projects Releases Wiki Activity

o_time.c: use gmtime_s with MSVC

Browse Source 
ts/ts_rsp_sign.c: change to OPENSSL_gmtime.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5720)

(cherry picked from commit 98c03302fb7b855647aa14022f61f5fb272e514a)
This commit is contained in:
Miroslav Suk 2018-03-22 09:20:43 +01:00 committed by Andy Polyakov
parent b1eaed1c99
commit ae43c92a33
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/o_time.c
View File

@ -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)

5
crypto/ts/ts_rsp_sign.c
View File

@ -16,6 +16,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 *);
@ -840,7 +841,7 @@ static ASN1_GENERALIZEDTIME
long sec, long usec, 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);
@ -848,7 +849,7 @@ static ASN1_GENERALIZEDTIME
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;
/*