The branch OpenSSL_1_0_2-stable has been updated via 6a285edd520f9508efb76f30aff9812ce7115fa8 (commit) from 46c815a97d21135561d2204574bbd7c184b1f0b5 (commit)
- Log ----------------------------------------------------------------- commit 6a285edd520f9508efb76f30aff9812ce7115fa8 Author: Miroslav Suk <miroslav....@eset.cz> Date: Thu Mar 22 09:20:43 2018 +0100 o_time.c: use gmtime_s with MSVC Reviewed-by: Andy Polyakov <ap...@openssl.org> Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5719) ----------------------------------------------------------------------- Summary of changes: crypto/o_time.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crypto/o_time.c b/crypto/o_time.c index 6192743..a763b2c 100755 --- a/crypto/o_time.c +++ b/crypto/o_time.c @@ -109,6 +109,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; #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK) ts = gmtime(timer); if (ts == NULL) _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits