projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tolerate broken CMS/PKCS7 implementations using signature OID instead of digest
[oweals/openssl.git]
/
crypto
/
tmdiff.c
diff --git
a/crypto/tmdiff.c
b/crypto/tmdiff.c
index 60fea0dab1b935da348c03a8c00b1fb69f006f2a..1c6e052ac98d7bf61e4014371fc7cf6cab9ab480 100644
(file)
--- a/
crypto/tmdiff.c
+++ b/
crypto/tmdiff.c
@@
-59,21
+59,24
@@
#include <stdlib.h>
#include "cryptlib.h"
#include <openssl/tmdiff.h>
#include <stdlib.h>
#include "cryptlib.h"
#include <openssl/tmdiff.h>
+#if !defined(OPENSSL_SYS_MSDOS)
+#include OPENSSL_UNISTD
+#endif
#ifdef TIMEB
#ifdef TIMEB
-#undef WIN32
+#undef
OPENSSL_SYS_
WIN32
#undef TIMES
#endif
#undef TIMES
#endif
-#ifndef MSDOS
-# ifndef WIN32
-# if !defined(VMS) || defined(__DECC)
-# define TIMES
-# endif
-# endif
+#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) && !(defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX_RHAPSODY) && !defined(OPENSSL_SYS_VXWORKS)
+# define TIMES
#endif
#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
@@
-85,7
+88,7
@@
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 */
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)
+#if defined(
OPENSSL_SYS_VMS
_DECC) && !defined(__TMS)
#undef TIMES
#endif
#undef TIMES
#endif
@@
-95,93
+98,105
@@
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
-#if
ndef TIMES
+#if
!defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
#include <sys/timeb.h>
#endif
#include <sys/timeb.h>
#endif
-#ifdef WIN32
+#ifdef
OPENSSL_SYS_
WIN32
#include <windows.h>
#endif
/* The following if from times(3) man page. It may need to be changed */
#ifndef HZ
#include <windows.h>
#endif
/* The following if from times(3) man page. It may need to be changed */
#ifndef HZ
-# ifndef CLK_TCK
-# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-# ifndef VMS
-# define HZ 100.0
-# else /* VMS */
+# if defined(_SC_CLK_TCK) \
+ && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
+/* # define HZ ((double)sysconf(_SC_CLK_TCK)) */
+# define HZ sysconf(_SC_CLK_TCK)
+# else
+# ifndef CLK_TCK
+# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
# define HZ 100.0
# define HZ 100.0
+# else /* _BSD_CLK_TCK_ */
+# define HZ ((double)_BSD_CLK_TCK_)
# endif
# endif
-# else /*
_BSD_CLK_TCK_
*/
-# define HZ ((double)
_BSD_CLK_TCK_
)
+# else /*
CLK_TCK
*/
+# define HZ ((double)
CLK_TCK
)
# endif
# endif
-# else /* CLK_TCK */
-# define HZ ((double)CLK_TCK)
# endif
#endif
# endif
#endif
-
typedef
struct ms_tm
+struct ms_tm
{
#ifdef TIMES
struct tms ms_tms;
#else
{
#ifdef TIMES
struct tms ms_tms;
#else
-# ifdef WIN32
+# ifdef
OPENSSL_SYS_
WIN32
HANDLE thread_id;
FILETIME ms_win32;
HANDLE thread_id;
FILETIME ms_win32;
+# elif defined (OPENSSL_SYS_NETWARE)
+ clock_t ms_clock;
# else
# else
+# ifdef OPENSSL_SYS_VXWORKS
+ unsigned long ticks;
+# else
struct timeb ms_timeb;
struct timeb ms_timeb;
+# endif
# endif
#endif
# endif
#endif
- }
MS_TM
;
+ };
-
char
*ms_time_new(void)
+
MS_TM
*ms_time_new(void)
{
MS_TM *ret;
{
MS_TM *ret;
- ret=(MS_TM *)
M
alloc(sizeof(MS_TM));
+ ret=(MS_TM *)
OPENSSL_m
alloc(sizeof(MS_TM));
if (ret == NULL)
return(NULL);
memset(ret,0,sizeof(MS_TM));
if (ret == NULL)
return(NULL);
memset(ret,0,sizeof(MS_TM));
-#ifdef WIN32
+#ifdef
OPENSSL_SYS_
WIN32
ret->thread_id=GetCurrentThread();
#endif
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)
{
if (a != NULL)
-
F
ree(a);
+
OPENSSL_f
ree(a);
}
}
-void ms_time_get(
char *a
)
+void ms_time_get(
MS_TM *tm
)
{
{
- MS_TM *tm=(MS_TM *)a;
-#ifdef WIN32
+#ifdef OPENSSL_SYS_WIN32
FILETIME tmpa,tmpb,tmpc;
#endif
#ifdef TIMES
times(&tm->ms_tms);
#else
FILETIME tmpa,tmpb,tmpc;
#endif
#ifdef TIMES
times(&tm->ms_tms);
#else
-# ifdef WIN32
+# ifdef
OPENSSL_SYS_
WIN32
GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
+# elif defined (OPENSSL_SYS_NETWARE)
+ tm->ms_clock = clock();
# else
# else
+# ifdef OPENSSL_SYS_VXWORKS
+ tm->ticks = tickGet();
+# else
ftime(&tm->ms_timeb);
ftime(&tm->ms_timeb);
+# endif
# endif
#endif
}
# 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
#else
-# ifdef WIN32
+# ifdef
OPENSSL_SYS_
WIN32
{
#ifdef __GNUC__
signed long long la,lb;
{
#ifdef __GNUC__
signed long long la,lb;
@@
-196,31
+211,43
@@
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
# else
+# ifdef OPENSSL_SYS_VXWORKS
+ ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
+# else
ret= (double)(b->ms_timeb.time-a->ms_timeb.time)+
(((double)b->ms_timeb.millitm)-
((double)a->ms_timeb.millitm))/1000.0;
# endif
ret= (double)(b->ms_timeb.time-a->ms_timeb.time)+
(((double)b->ms_timeb.millitm)-
((double)a->ms_timeb.millitm))/1000.0;
# endif
+# endif
#endif
return((ret < 0.0000001)?0.0000001:ret);
}
#endif
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
#else
-# ifdef WIN32
+# 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;
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
# else
+# ifdef OPENSSL_SYS_VXWORKS
+ d = (b->ticks - a->ticks);
+# else
d= (double)(b->ms_timeb.time-a->ms_timeb.time)+
(((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0;
# endif
d= (double)(b->ms_timeb.time-a->ms_timeb.time)+
(((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0;
# endif
+# endif
#endif
if (d == 0.0)
ret=0;
#endif
if (d == 0.0)
ret=0;