diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-05-26 07:27:45 +0200 |
|---|---|---|
| committer | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2017-06-03 00:41:47 +0900 |
| commit | bd4a53493b4d130e39955a2497995707666cffd4 (patch) | |
| tree | ca6d428d3eca9528608af14f0d969f8999e87c64 /deps/openssl/openssl/crypto/o_time.c | |
| parent | a235e670a820107210be27e0cd266164763fb014 (diff) | |
| download | android-node-v8-bd4a53493b4d130e39955a2497995707666cffd4.tar.gz android-node-v8-bd4a53493b4d130e39955a2497995707666cffd4.tar.bz2 android-node-v8-bd4a53493b4d130e39955a2497995707666cffd4.zip | |
deps: upgrade openssl sources to 1.0.2l
This replaces all sources of openssl-1.0.2l.tar.gz into
deps/openssl/openssl
Fixes: https://github.com/nodejs/node/issues/13161
PR-URL: https://github.com/nodejs/node/pull/13233
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/openssl/openssl/crypto/o_time.c')
| -rwxr-xr-x | deps/openssl/openssl/crypto/o_time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/deps/openssl/openssl/crypto/o_time.c b/deps/openssl/openssl/crypto/o_time.c index b99e5990b4..04d805d9a9 100755 --- a/deps/openssl/openssl/crypto/o_time.c +++ b/deps/openssl/openssl/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); |