[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  07bc93f479bb73567b23ceb6c2d96e7cc511edd3 (commit)
      from  177b4225baac56336e04fd97d0c993fd45d3e45e (commit)


- Log -----------------------------------------------------------------
commit 07bc93f479bb73567b23ceb6c2d96e7cc511edd3
Author: Guido Vranken <guidovranken at gmail.com>
Date:   Sat Feb 11 22:41:38 2017 +0100

    Remove obsolete comment
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (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 e785525..4b902e0 100755
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -52,11 +52,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_VMS) || defined(gmtime_r)) && !defined(OPENSSL_SYS_MACOSX)
-    /*
-     * 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);