TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use compare_testvector() instead of XMEMCMP() in tests

Browse Source
This commit is contained in:
Steffen Jaeckel
2017-06-22 14:21:14 +02:00
parent 05e28d6cfa
commit 27b3ffc627
35 changed files with 81 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc/adler32.c
+1 -7
View File
@@ -118,13 +118,7 @@ int adler32_test(void)
adler32_init(&ctx);
adler32_update(&ctx, in, strlen(in));
adler32_finish(&ctx, out, 4);
if (XMEMCMP(adler32, out, 4)) {
#ifdef LTC_TEST_DBG
ulong32 _out, _adler32;
LOAD32H(_out, out);
LOAD32H(_adler32, adler32);
printf("adler32 fail! Is: 0x%x Should: 0x%x\n", _out, _adler32);
#endif
if (compare_testvector(adler32, 4, out, 4, "adler32", 0)) {
return CRYPT_FAIL_TESTVECTOR;
}
return CRYPT_OK;
src/misc/crc32.c
+1 -7
View File
@@ -189,13 +189,7 @@ int crc32_test(void)
crc32_init(&ctx);
crc32_update(&ctx, in, strlen(in));
crc32_finish(&ctx, out, 4);
if (XMEMCMP(crc32, out, 4)) {
#ifdef LTC_TEST_DBG
ulong32 _out, _crc32;
LOAD32H(_out, out);
LOAD32H(_crc32, crc32);
printf("crc32 fail! Is: 0x%x Should: 0x%x\n", _out, _crc32);
#endif
if (compare_testvector(crc32, 4, out, 4, "CRC32", 0)) {
return CRYPT_FAIL_TESTVECTOR;
}
return CRYPT_OK;
src/misc/hkdf/hkdf_test.c
+2 -18
View File
@@ -265,33 +265,17 @@ int hkdf_test(void)
cases[i].info, cases[i].info_l,
cases[i].IKM, cases[i].IKM_l,
OKM, cases[i].OKM_l)) != CRYPT_OK) {
#ifdef LTC_TEST_DBG
#if LTC_TEST_DBG > 1
printf("LTC_HKDF-%s test #%d, %s\n", cases[i].Hash, i, error_to_string(err));
#endif
return err;
}
if(XMEMCMP(OKM, cases[i].OKM, (size_t)cases[i].OKM_l) != 0) {
if(compare_testvector(OKM, cases[i].OKM_l, cases[i].OKM, (size_t)cases[i].OKM_l, "HKDF", cases[i].num)) {
failed++;
#ifdef LTC_TEST_DBG
{
unsigned int j;
printf("\nLTC_HKDF-%s test #%d:\n", cases[i].Hash, cases[i].num);
printf( "Result: 0x");
for(j=0; j < cases[i].OKM_l; j++) {
printf("%02x ", OKM[j]);
}
printf("\nCorrect: 0x");
for(j=0; j < cases[i].OKM_l; j++) {
printf("%02x ", cases[i].OKM[j]);
}
printf("\n");
return CRYPT_ERROR;
}
#if LTC_TEST_DBG > 1
} else {
printf("LTC_HKDF-%s test #%d: Passed\n", cases[i].Hash, cases[i].num);
#endif
#endif
}
}