generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use more portable clock_gettime() for fips_test_suite timing.

Browse Source 
Output times of each subtest.
This commit is contained in:
Dr. Stephen Henson 2011-05-02 11:09:38 +00:00
parent fd600c0037
commit fc98a4377d
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fips/fips_test_suite.c
View File

@ -718,6 +718,9 @@ static int post_cb(int op, int id, int subid, void *ex)
const char *idstr, *exstr = ""; const char *idstr, *exstr = "";
char asctmp[20]; char asctmp[20];
int keytype = -1; int keytype = -1;
#ifdef FIPS_POST_TIME
static struct timespec start, end, tstart, tend;
#endif
switch(id) switch(id)
{ {
case FIPS_TEST_INTEGRITY: case FIPS_TEST_INTEGRITY:
@ -807,19 +810,38 @@ static int post_cb(int op, int id, int subid, void *ex)
switch(op) switch(op)
{ {
case FIPS_POST_BEGIN: case FIPS_POST_BEGIN:
#ifdef FIPS_POST_TIME
clock_gettime(CLOCK_REALTIME, &tstart);
#endif
printf("\tPOST started\n"); printf("\tPOST started\n");
break; break;
case FIPS_POST_END: case FIPS_POST_END:
printf("\tPOST %s\n", id ? "Success" : "Failed"); printf("\tPOST %s\n", id ? "Success" : "Failed");
#ifdef FIPS_POST_TIME
clock_gettime(CLOCK_REALTIME, &tend);
printf("\t\tTook %f seconds\n",
(double)((tend.tv_sec+tend.tv_nsec*1e-9)
- (tstart.tv_sec+tstart.tv_nsec*1e-9)));
#endif
break; break;
case FIPS_POST_STARTED: case FIPS_POST_STARTED:
printf("\t\t%s %s test started\n", idstr, exstr); printf("\t\t%s %s test started\n", idstr, exstr);
#ifdef FIPS_POST_TIME
clock_gettime(CLOCK_REALTIME, &start);
#endif
break; break;
case FIPS_POST_SUCCESS: case FIPS_POST_SUCCESS:
printf("\t\t%s %s test OK\n", idstr, exstr); printf("\t\t%s %s test OK\n", idstr, exstr);
#ifdef FIPS_POST_TIME
clock_gettime(CLOCK_REALTIME, &end);
printf("\t\t\tTook %f seconds\n",
(double)((end.tv_sec+end.tv_nsec*1e-9)
- (start.tv_sec+start.tv_nsec*1e-9)));
start = end;
#endif
break; break;
case FIPS_POST_FAIL: case FIPS_POST_FAIL:
@ -920,21 +942,11 @@ int main(int argc,char **argv)
exit(1); exit(1);
} }
if (!no_exit) { if (!no_exit) {
#ifdef FIPS_POST_TIME
clock_t start, end;
#endif
fips_algtest_init_nofips(); fips_algtest_init_nofips();
#ifdef FIPS_POST_TIME
start = clock();
#endif
if (!FIPS_mode_set(1)) { if (!FIPS_mode_set(1)) {
printf("Power-up self test failed\n"); printf("Power-up self test failed\n");
exit(1); exit(1);
} }
#ifdef FIPS_POST_TIME
end = clock();
printf("Took %f seconds\n", ((double)(end - start))/CLOCKS_PER_SEC);
#endif
printf("Power-up self test successful\n"); printf("Power-up self test successful\n");
exit(0); exit(0);
} }