X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fo_time.c;h=e29091d6504c1fab544be3da4ac2fbcf4f74e741;hb=71fc9b37aedb0ee7e664fba53696a11d0b879dd7;hp=723eb1b5af781927047003144bc98f554fbe2a66;hpb=52c4c51f02c1bec0440f520aa98765072d1f0286;p=oweals%2Fopenssl.git

diff --git a/crypto/o_time.c b/crypto/o_time.c
index 723eb1b5af..e29091d650 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -73,7 +73,7 @@ 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)) && !defined(OPENSSL_SYS_MACOSX)
+#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_OS2) && !defined(__CYGWIN32__) && (!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);
@@ -114,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. */
 		{
@@ -198,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