benchmark.c conflicts resolved

pull/1/head
Takashi Kojo 2013-11-12 08:21:41 +09:00
parent 5a9140fd13
commit b54b92bc2a
1 changed files with 4 additions and 6 deletions

View File

@ -923,7 +923,6 @@ void bench_eccKeyGen(void)
ecc_key genKey; ecc_key genKey;
double start, total, each, milliEach; double start, total, each, milliEach;
int i, ret; int i, ret;
const int genTimes = 5;
ret = InitRng(&rng); ret = InitRng(&rng);
if (ret < 0) { if (ret < 0) {
@ -952,7 +951,6 @@ void bench_eccKeyAgree(void)
ecc_key genKey, genKey2; ecc_key genKey, genKey2;
double start, total, each, milliEach; double start, total, each, milliEach;
int i, ret; int i, ret;
const int agreeTimes = 5;
byte shared[1024]; byte shared[1024];
byte sig[1024]; byte sig[1024];
byte digest[32]; byte digest[32];
@ -1048,13 +1046,13 @@ void bench_eccKeyAgree(void)
double current_time(int reset) double current_time(int reset)
{ {
(void)reset;
static int init = 0; static int init = 0;
static LARGE_INTEGER freq; static LARGE_INTEGER freq;
LARGE_INTEGER count; LARGE_INTEGER count;
(void)reset;
if (!init) { if (!init) {
QueryPerformanceFrequency(&freq); QueryPerformanceFrequency(&freq);
init = 1; init = 1;
@ -1096,13 +1094,13 @@ void bench_eccKeyAgree(void)
double current_time(int reset) double current_time(int reset)
{ {
struct timeval tv;
(void)reset; (void)reset;
struct timeval tv;
gettimeofday(&tv, 0); gettimeofday(&tv, 0);
return (double)tv.tv_sec + (double)tv.tv_usec / 1000000; return (double)tv.tv_sec + (double)tv.tv_usec / 1000000;
} }
#endif /* _WIN32 */ #endif /* _WIN32 */