From c07bea4706cfb2e50753f5af01364a2dd815689e Mon Sep 17 00:00:00 2001 From: beck <> Date: Sun, 13 Apr 2014 22:11:45 +0000 Subject: Remove vms support stuff. ok deraadt@ --- src/lib/libcrypto/o_time.c | 144 +-------------------------------------------- 1 file changed, 1 insertion(+), 143 deletions(-) (limited to 'src/lib/libcrypto/o_time.c') diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c index 9030fdef7a..5fb5d4e6d7 100644 --- a/src/lib/libcrypto/o_time.c +++ b/src/lib/libcrypto/o_time.c @@ -63,21 +63,6 @@ #include #include "o_time.h" -#ifdef OPENSSL_SYS_VMS -# if __CRTL_VER >= 70000000 && \ - (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE) -# define VMS_GMTIME_OK -# endif -# ifndef VMS_GMTIME_OK -# include -# include -# include -# include -# include -# include -# endif /* ndef VMS_GMTIME_OK */ -#endif - struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) { struct tm *ts = NULL; @@ -87,140 +72,13 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) so we don't even look at the return value */ gmtime_r(timer,result); ts = result; -#elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK) +#else ts = gmtime(timer); if (ts == NULL) return NULL; memcpy(result, ts, sizeof(struct tm)); ts = result; -#endif -#if defined( OPENSSL_SYS_VMS) && !defined( VMS_GMTIME_OK) - if (ts == NULL) - { - static $DESCRIPTOR(tabnam,"LNM$DCL_LOGICAL"); - static $DESCRIPTOR(lognam,"SYS$TIMEZONE_DIFFERENTIAL"); - char logvalue[256]; - unsigned int reslen = 0; - struct { - short buflen; - short code; - void *bufaddr; - unsigned int *reslen; - } itemlist[] = { - { 0, LNM$_STRING, 0, 0 }, - { 0, 0, 0, 0 }, - }; - int status; - time_t t; - - /* Get the value for SYS$TIMEZONE_DIFFERENTIAL */ - itemlist[0].buflen = sizeof(logvalue); - itemlist[0].bufaddr = logvalue; - itemlist[0].reslen = &reslen; - status = sys$trnlnm(0, &tabnam, &lognam, 0, itemlist); - if (!(status & 1)) - 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 -= status; -#endif - - /* then convert the result to the time structure */ - - /* Since there was no gmtime_r() to do this stuff for us, - we have to do it the hard way. */ - { - /* The VMS epoch is the astronomical Smithsonian date, - if I remember correctly, which is November 17, 1858. - Furthermore, time is measure in thenths of microseconds - and stored in quadwords (64 bit integers). unix_epoch - below is January 1st 1970 expressed as a VMS time. The - following code was used to get this number: - - #include - #include - #include - #include - - main() - { - unsigned long systime[2]; - unsigned short epoch_values[7] = - { 1970, 1, 1, 0, 0, 0, 0 }; - - lib$cvt_vectim(epoch_values, systime); - - printf("%u %u", systime[0], systime[1]); - } - */ - unsigned long unix_epoch[2] = { 1273708544, 8164711 }; - unsigned long deltatime[2]; - unsigned long systime[2]; - struct vms_vectime - { - short year, month, day, hour, minute, second, - centi_second; - } time_values; - long operation; - - /* Turn the number of seconds since January 1st 1970 to - an internal delta time. - Note that lib$cvt_to_internal_time() will assume - that t is signed, and will therefore break on 32-bit - systems some time in 2038. - */ - operation = LIB$K_DELTA_SECONDS; - status = lib$cvt_to_internal_time(&operation, - &t, deltatime); - - /* Add the delta time with the Unix epoch and we have - the current UTC time in internal format */ - status = lib$add_times(unix_epoch, deltatime, systime); - - /* Turn the internal time into a time vector */ - status = sys$numtim(&time_values, systime); - - /* Fill in the struct tm with the result */ - result->tm_sec = time_values.second; - result->tm_min = time_values.minute; - result->tm_hour = time_values.hour; - result->tm_mday = time_values.day; - result->tm_mon = time_values.month - 1; - result->tm_year = time_values.year - 1900; - - operation = LIB$K_DAY_OF_WEEK; - status = lib$cvt_from_internal_time(&operation, - &result->tm_wday, systime); - result->tm_wday %= 7; - - operation = LIB$K_DAY_OF_YEAR; - status = lib$cvt_from_internal_time(&operation, - &result->tm_yday, systime); - result->tm_yday--; - - result->tm_isdst = 0; /* There's no way to know... */ - - ts = result; - } - } #endif return ts; } -- cgit v1.2.3-55-g6feb