diff options
| author | nectar <nectar@FreeBSD.org> | 2002-07-30 12:46:49 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-07-30 12:46:49 +0000 |
| commit | 8b62a95bfc62aca74fc680ca8676348f39a51bd6 (patch) | |
| tree | 8349084912ae6ced5698dc3c8d8b0166dc4786f1 /crypto/openssl/apps/speed.c | |
| parent | 050218e0d0c68a2e1a37afaab11e3c586d4f1b7d (diff) | |
| download | FreeBSD-src-8b62a95bfc62aca74fc680ca8676348f39a51bd6.zip FreeBSD-src-8b62a95bfc62aca74fc680ca8676348f39a51bd6.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.6d.
Diffstat (limited to 'crypto/openssl/apps/speed.c')
| -rw-r--r-- | crypto/openssl/apps/speed.c | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 554169c..ad3ebad 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -84,12 +84,12 @@ #include <openssl/rand.h> #include <openssl/err.h> -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_DARWIN) # define USE_TOD -#elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) +#elif !defined(MSDOS) && !defined(VXWORKS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) && !defined(_DARWIN) && !defined(VXWORKS) # define TIMEB #endif @@ -117,7 +117,7 @@ #include <sys/timeb.h> #endif -#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD) +#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD) && !defined(VXWORKS) #error "It seems neither struct tms nor struct timeb is supported in this platform!" #endif @@ -226,7 +226,7 @@ static double Time_F(int s, int usertime) #ifdef USE_TOD if(usertime) - { + { static struct rusage tstart,tend; if (s == START) @@ -286,7 +286,23 @@ static double Time_F(int s, int usertime) # if defined(TIMES) && defined(TIMEB) else # endif -# ifdef TIMEB +# ifdef VXWORKS + { + static unsigned long tick_start, tick_end; + + if( s == START ) + { + tick_start = tickGet(); + return 0; + } + else + { + tick_end = tickGet(); + ret = (double)(tick_end - tick_start) / (double)sysClkRateGet(); + return((ret < 0.001)?0.001:ret); + } + } +# elif defined(TIMEB) { static struct timeb tstart,tend; long i; @@ -305,6 +321,7 @@ static double Time_F(int s, int usertime) } } # endif + #endif } @@ -320,7 +337,9 @@ int MAIN(int argc, char **argv) #define DSA_NUM 3 long count,rsa_count; int i,j,k; +#ifndef NO_RSA unsigned rsa_num; +#endif #ifndef NO_MD2 unsigned char md2[MD2_DIGEST_LENGTH]; #endif |
