2 files changed, 8 insertions, 36 deletions

diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c
index 44f7ba3b8c..83028356b9 100644
--- a/src/lib/libcrypto/o_time.c
+++ b/src/lib/libcrypto/o_time.c
@@ -63,24 +63,10 @@
 #include <string.h>
 #include "o_time.h"
 
-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);
-        ts = result;
-#else
-        ts = gmtime(timer);
-        if (ts == NULL)
-                return NULL;
-
-        memcpy(result, ts, sizeof(struct tm));
-        ts = result;
-#endif
-        return ts;
+struct tm *
+OPENSSL_gmtime(const time_t *timer, struct tm *result)
+{
+        return gmtime_r(timer, result);
 }
 
 /* Take a tm structure and add an offset to it. This avoids any OS issues
diff --git a/src/lib/libssl/src/crypto/o_time.c b/src/lib/libssl/src/crypto/o_time.c
index 44f7ba3b8c..83028356b9 100644
--- a/src/lib/libssl/src/crypto/o_time.c
+++ b/src/lib/libssl/src/crypto/o_time.c
@@ -63,24 +63,10 @@
 #include <string.h>
 #include "o_time.h"
 
-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);
-        ts = result;
-#else
-        ts = gmtime(timer);
-        if (ts == NULL)
-                return NULL;
-
-        memcpy(result, ts, sizeof(struct tm));
-        ts = result;
-#endif
-        return ts;
+struct tm *
+OPENSSL_gmtime(const time_t *timer, struct tm *result)
+{
+        return gmtime_r(timer, result);
 }
 
 /* Take a tm structure and add an offset to it. This avoids any OS issues