The branch OpenSSL_1_0_2-stable has been updated
via b70dc3a66d168b0f136a6edf50239df6e13abdac (commit)
from 4fd35d83412946d19da05d4c89f6c2002d5c2e82 (commit)
- Log -----------------------------------------------------------------
commit b70dc3a66d168b0f136a6edf50239df6e13abdac
Author: Guido Vranken <[email protected]>
Date: Sat Feb 11 22:41:38 2017 +0100
Remove obsolete comment
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/1613)
(cherry picked from commit 7c120357e5ef434c8a7d1d1c3ba4f2a33266374e)
-----------------------------------------------------------------------
Summary of changes:
crypto/o_time.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/crypto/o_time.c b/crypto/o_time.c
index b99e599..04d805d 100755
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -106,11 +106,8 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm
*result)
struct tm *ts = NULL;
#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) &&
!defined(OPENSSL_SYS_OS2) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r))
&& !defined(OPENSSL_SYS_MACOSX) && !defined(OPENSSL_SYS_SUNOS)
- /*
- * should return &data, but doesn't on some systems, so we don't even
- * look at the return value
- */
- gmtime_r(timer, result);
+ if (gmtime_r(timer, result) == NULL)
+ return NULL;
ts = result;
#elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
ts = gmtime(timer);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits