testsuite time check on Windows system and fix dh_test if statement

pull/853/head
Jacob Barthelmeh 2017-04-12 15:56:45 -06:00
parent 3abcff4db5
commit 26c8958d1e
1 changed files with 11 additions and 6 deletions

View File

@ -1042,11 +1042,15 @@ int asn_test()
if (wc_GetTime(&now, 0) != BUFFER_E)
return -101;
now = 0;
if (wc_GetTime(&now, sizeof(now)) != 0)
return -102;
if (now == 0)
return -103;
if (sizeof(long) >= sizeof(time_t)) {
now = 0;
if (wc_GetTime(&now, sizeof(now)) != 0) {
return -102;
}
if (now == 0) {
return -103;
}
}
#endif
return 0;
@ -8071,8 +8075,9 @@ int dh_test(void)
ret = -55; goto done;
}
if (agreeSz != agreeSz2 || XMEMCMP(agree, agree2, agreeSz))
if (agreeSz != agreeSz2 || XMEMCMP(agree, agree2, agreeSz)) {
ret = -56; goto done;
}
ret = dh_generate_test(&rng);
if (ret != 0)