projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added restrictions on the use of proxy certificates, as they may pose
[openssl.git]
/
crypto
/
tmdiff.c
diff --git
a/crypto/tmdiff.c
b/crypto/tmdiff.c
index 307523ebba3b96248383b7911178d9809df8ee1e..1c6e052ac98d7bf61e4014371fc7cf6cab9ab480 100644
(file)
--- a/
crypto/tmdiff.c
+++ b/
crypto/tmdiff.c
@@
-72,7
+72,11
@@
# define TIMES
#endif
# define TIMES
#endif
-#ifndef _IRIX
+#ifdef OPENSSL_SYS_NETWARE
+#undef TIMES
+#endif
+
+#if !defined(_IRIX) || defined (OPENSSL_SYS_NETWARE)
# include <time.h>
#endif
#ifdef TIMES
# include <time.h>
#endif
#ifdef TIMES
@@
-94,7
+98,7
@@
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
-#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS)
+#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS)
&& !defined(OPENSSL_SYS_NETWARE)
#include <sys/timeb.h>
#endif
#include <sys/timeb.h>
#endif
@@
-106,7
+110,8
@@
#ifndef HZ
# if defined(_SC_CLK_TCK) \
&& (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
#ifndef HZ
# if defined(_SC_CLK_TCK) \
&& (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
-# define HZ ((double)sysconf(_SC_CLK_TCK))
+/* # define HZ ((double)sysconf(_SC_CLK_TCK)) */
+# define HZ sysconf(_SC_CLK_TCK)
# else
# ifndef CLK_TCK
# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
# else
# ifndef CLK_TCK
# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
@@
-120,7
+125,7
@@
# endif
#endif
# endif
#endif
-
typedef
struct ms_tm
+struct ms_tm
{
#ifdef TIMES
struct tms ms_tms;
{
#ifdef TIMES
struct tms ms_tms;
@@
-128,6
+133,8
@@
typedef struct ms_tm
# ifdef OPENSSL_SYS_WIN32
HANDLE thread_id;
FILETIME ms_win32;
# ifdef OPENSSL_SYS_WIN32
HANDLE thread_id;
FILETIME ms_win32;
+# elif defined (OPENSSL_SYS_NETWARE)
+ clock_t ms_clock;
# else
# ifdef OPENSSL_SYS_VXWORKS
unsigned long ticks;
# else
# ifdef OPENSSL_SYS_VXWORKS
unsigned long ticks;
@@
-136,9
+143,9
@@
typedef struct ms_tm
# endif
# endif
#endif
# endif
# endif
#endif
- }
MS_TM
;
+ };
-
char
*ms_time_new(void)
+
MS_TM
*ms_time_new(void)
{
MS_TM *ret;
{
MS_TM *ret;
@@
-149,18
+156,17
@@
char *ms_time_new(void)
#ifdef OPENSSL_SYS_WIN32
ret->thread_id=GetCurrentThread();
#endif
#ifdef OPENSSL_SYS_WIN32
ret->thread_id=GetCurrentThread();
#endif
- return
((char *)ret)
;
+ return
ret
;
}
}
-void ms_time_free(
char
*a)
+void ms_time_free(
MS_TM
*a)
{
if (a != NULL)
OPENSSL_free(a);
}
{
if (a != NULL)
OPENSSL_free(a);
}
-void ms_time_get(
char *a
)
+void ms_time_get(
MS_TM *tm
)
{
{
- MS_TM *tm=(MS_TM *)a;
#ifdef OPENSSL_SYS_WIN32
FILETIME tmpa,tmpb,tmpc;
#endif
#ifdef OPENSSL_SYS_WIN32
FILETIME tmpa,tmpb,tmpc;
#endif
@@
-170,6
+176,8
@@
void ms_time_get(char *a)
#else
# ifdef OPENSSL_SYS_WIN32
GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
#else
# ifdef OPENSSL_SYS_WIN32
GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
+# elif defined (OPENSSL_SYS_NETWARE)
+ tm->ms_clock = clock();
# else
# ifdef OPENSSL_SYS_VXWORKS
tm->ticks = tickGet();
# else
# ifdef OPENSSL_SYS_VXWORKS
tm->ticks = tickGet();
@@
-180,14
+188,13
@@
void ms_time_get(char *a)
#endif
}
#endif
}
-double ms_time_diff(
char *ap, char *bp
)
+double ms_time_diff(
MS_TM *a, MS_TM *b
)
{
{
- MS_TM *a=(MS_TM *)ap;
- MS_TM *b=(MS_TM *)bp;
double ret;
#ifdef TIMES
double ret;
#ifdef TIMES
- ret=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ;
+ ret = HZ;
+ ret = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / ret;
#else
# ifdef OPENSSL_SYS_WIN32
{
#else
# ifdef OPENSSL_SYS_WIN32
{
@@
-204,6
+211,8
@@
double ms_time_diff(char *ap, char *bp)
lb+=b->ms_win32.dwLowDateTime;
ret=((double)(lb-la))/1e7;
}
lb+=b->ms_win32.dwLowDateTime;
ret=((double)(lb-la))/1e7;
}
+# elif defined (OPENSSL_SYS_NETWARE)
+ ret= (double)(b->ms_clock - a->ms_clock);
# else
# ifdef OPENSSL_SYS_VXWORKS
ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
# else
# ifdef OPENSSL_SYS_VXWORKS
ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
@@
-217,18
+226,20
@@
double ms_time_diff(char *ap, char *bp)
return((ret < 0.0000001)?0.0000001:ret);
}
return((ret < 0.0000001)?0.0000001:ret);
}
-int ms_time_cmp(c
har *ap, char *bp
)
+int ms_time_cmp(c
onst MS_TM *a, const MS_TM *b
)
{
{
- MS_TM *a=(MS_TM *)ap,*b=(MS_TM *)bp;
double d;
int ret;
#ifdef TIMES
double d;
int ret;
#ifdef TIMES
- d=(b->ms_tms.tms_utime-a->ms_tms.tms_utime)/HZ;
+ d = HZ;
+ d = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / d;
#else
# ifdef OPENSSL_SYS_WIN32
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
# ifdef OPENSSL_SYS_WIN32
d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7;
d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
+# elif defined (OPENSSL_SYS_NETWARE)
+ d= (double)(b->ms_clock - a->ms_clock);
# else
# ifdef OPENSSL_SYS_VXWORKS
d = (b->ticks - a->ticks);
# else
# ifdef OPENSSL_SYS_VXWORKS
d = (b->ticks - a->ticks);