OpenSSL 0.9.4 merge

1 files changed, 59 insertions, 47 deletions

diff --git a/src/lib/libssl/src/crypto/tmdiff.c b/src/lib/libssl/src/crypto/tmdiff.c
index b93799fc03..0ad8a9ed8d 100644
--- a/src/lib/libssl/src/crypto/tmdiff.c
+++ b/src/lib/libssl/src/crypto/tmdiff.c
@@ -57,32 +57,40 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include "cryptlib.h"
+#include <openssl/tmdiff.h>
+
+#ifdef TIMEB
+#undef WIN32
+#undef TIMES
+#endif
 
 #ifndef MSDOS
 #  ifndef WIN32
-#  define TIMES
+#    if !defined(VMS) || defined(__DECC)
+#      define TIMES
+#    endif
 #  endif
 #endif
 
-#ifndef VMS
-#  ifndef _IRIX
-#   include <time.h>
-#  endif
-#  ifdef TIMES
-#    include <sys/types.h>
-#    include <sys/times.h>
-#  endif
-#else /* VMS */
-#  include <types.h>
-        struct tms {
-                time_t tms_utime;
-                time_t tms_stime;
-                time_t tms_uchild;      /* I dunno...  */
-                time_t tms_uchildsys;   /* so these names are a guess :-) */
-                }
-#endif /* VMS */
-
-#ifdef sun
+#ifndef _IRIX
+#  include <time.h>
+#endif
+#ifdef TIMES
+#  include <sys/types.h>
+#  include <sys/times.h>
+#endif
+
+/* Depending on the VMS version, the tms structure is perhaps defined.
+   The __TMS macro will show if it was.  If it wasn't defined, we should
+   undefine TIMES, since that tells the rest of the program how things
+   should be handled.                           -- Richard Levitte */
+#if defined(VMS) && defined(__DECC) && !defined(__TMS)
+#undef TIMES
+#endif
+
+#if defined(sun) || defined(__ultrix)
+#define _POSIX_SOURCE
 #include <limits.h>
 #include <sys/param.h>
 #endif
@@ -99,11 +107,7 @@
 #ifndef HZ
 # ifndef CLK_TCK
 #  ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-#   ifndef VMS
-#    define HZ  100.0
-#   else /* VMS */
-#    define HZ  100.0
-#   endif
+#   define HZ  100.0
 #  else /* _BSD_CLK_TCK_ */
 #   define HZ ((double)_BSD_CLK_TCK_)
 #  endif
@@ -126,11 +130,11 @@ typedef struct ms_tm
 #endif
         } MS_TM;
 
-char *ms_time_init()
+char *ms_time_new(void)
         {
         MS_TM *ret;
 
-        ret=malloc(sizeof(MS_TM));
+        ret=(MS_TM *)Malloc(sizeof(MS_TM));
         if (ret == NULL)
                 return(NULL);
         memset(ret,0,sizeof(MS_TM));
@@ -140,34 +144,31 @@ char *ms_time_init()
         return((char *)ret);
         }
 
-void ms_time_final(a)
-char *a;
+void ms_time_free(char *a)
         {
         if (a != NULL)
-                free(a);
+                Free(a);
         }
 
-void ms_time_get(a)
-char *a;
+void ms_time_get(char *a)
         {
         MS_TM *tm=(MS_TM *)a;
-    FILETIME tmpa,tmpb,tmpc;
+#ifdef WIN32
+        FILETIME tmpa,tmpb,tmpc;
+#endif
 
 #ifdef TIMES
-    printf("AAA\n");
         times(&tm->ms_tms);
 #else
 #  ifdef WIN32
         GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
 #  else
-    printf("CCC\n");
-        ftime(tm->ms_timeb);
+        ftime(&tm->ms_timeb);
 #  endif
 #endif
         }
 
-double ms_time_diff(ap,bp)
-char *ap,*bp;
+double ms_time_diff(char *ap, char *bp)
         {
         MS_TM *a=(MS_TM *)ap;
         MS_TM *b=(MS_TM *)bp;
@@ -177,19 +178,30 @@ char *ap,*bp;
         ret=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ;
 #else
 # ifdef WIN32
-        ret =(double)(b->ms_win32.dwHighDateTime&0x000fffff)*10+
-                b->ms_win32.dwLowDateTime/1e7;
-        ret-=(double)(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
+        {
+#ifdef __GNUC__
+        signed long long la,lb;
+#else
+        signed _int64 la,lb;
+#endif
+        la=a->ms_win32.dwHighDateTime;
+        lb=b->ms_win32.dwHighDateTime;
+        la<<=32;
+        lb<<=32;
+        la+=a->ms_win32.dwLowDateTime;
+        lb+=b->ms_win32.dwLowDateTime;
+        ret=((double)(lb-la))/1e7;
+        }
 # else
-        ret=     (double)(b->time-a->time)+
-                ((double)((unsigned long)b->mullitm-(unsigned long)))/1000.0;
+        ret=     (double)(b->ms_timeb.time-a->ms_timeb.time)+
+                (((double)b->ms_timeb.millitm)-
+                ((double)a->ms_timeb.millitm))/1000.0;
 #  endif
 #endif
         return((ret < 0.0000001)?0.0000001:ret);
         }
 
-int ms_time_cmp(ap,bp)
-char *ap,*bp;
+int ms_time_cmp(char *ap, char *bp)
         {
         MS_TM *a=(MS_TM *)ap,*b=(MS_TM *)bp;
         double d;
@@ -202,8 +214,8 @@ char *ap,*bp;
         d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7;
         d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
 # else
-        d=       (double)(b->time-a->time)+
-                ((double)((unsigned long)b->mullitm-(unsigned long)))/1000.0;
+        d=       (double)(b->ms_timeb.time-a->ms_timeb.time)+
+                (((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0;
 #  endif
 #endif
         if (d == 0.0)