X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fo_time.c;h=607556b0a630319181c8529a03501853541a6f4d;hp=61f30315cf1e3626728c352a0c2fec74068542ff;hb=1c23bc5670f22ff7663dcc09fc3b2e9ab4475134;hpb=dc01b6b1f20e9fa8a975f5f28e55fdaa75fe37e6

diff --git a/crypto/o_time.c b/crypto/o_time.c
index 61f30315cf..607556b0a6 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -1,5 +1,5 @@
 /* crypto/o_time.c -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (levitte@stacken.kth.se) for the OpenSSL
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
 /* ====================================================================
@@ -57,6 +57,7 @@
  */
 
 #include <openssl/e_os2.h>
+#include <string.h>
 #include "o_time.h"
 
 #ifdef OPENSSL_SYS_VMS
@@ -72,13 +73,16 @@ 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(__CYGWIN32__) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r))
+#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;
 #elif !defined(OPENSSL_SYS_VMS)
 	ts = gmtime(timer);
+	if (ts == NULL)
+		return NULL;
+
 	memcpy(result, ts, sizeof(struct tm));
 	ts = result;
 #endif
@@ -110,16 +114,28 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
 			return NULL;
 		logvalue[reslen] = '\0';
 
+		t = *timer;
+
+/* The following is extracted from the DEC C header time.h */
+/*
+**  Beginning in OpenVMS Version 7.0 mktime, time, ctime, strftime
+**  have two implementations.  One implementation is provided
+**  for compatibility and deals with time in terms of local time,
+**  the other __utc_* deals with time in terms of UTC.
+*/
+/* We use the same conditions as in said time.h to check if we should
+   assume that t contains local time (and should therefore be adjusted)
+   or UTC (and should therefore be left untouched). */
+#if __CRTL_VER < 70000000 || defined _VMS_V6_SOURCE
 		/* Get the numerical value of the equivalence string */
 		status = atoi(logvalue);
 
 		/* and use it to move time to GMT */
-		t = *timer - status;
+		t -= status;
+#endif
 
 		/* then convert the result to the time structure */
-#ifndef OPENSSL_THREADS
-		ts=(struct tm *)localtime(&t);
-#else
+
 		/* Since there was no gmtime_r() to do this stuff for us,
 		   we have to do it the hard way. */
 		{
@@ -194,7 +210,6 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
 		result->tm_isdst = 0; /* There's no way to know... */
 
 		ts = result;
-#endif
 		}
 		}
 #endif