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

re-work debug output of some tests

Browse Source
This commit is contained in:
Steffen Jaeckel
2015-08-23 19:45:26 +02:00
parent 1987a2f975
commit 9585faca2b
6 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mac/hmac/hmac_test.c
+7 -15
View File
@@ -603,7 +603,7 @@ int hmac_test(void)
++tested;
outlen = sizeof(digest);
if((err = hmac_memory(hash, cases[i].key, cases[i].keylen, cases[i].data, cases[i].datalen, digest, &outlen)) != CRYPT_OK) {
#ifdef LTC_HMAC_TEST_DBG
#ifdef LTC_TEST_DBG
printf("HMAC-%s test %s, %s\n", cases[i].algo, cases[i].num, error_to_string(err));
#endif
return err;
@@ -611,25 +611,17 @@ int hmac_test(void)
if(XMEMCMP(digest, cases[i].digest, (size_t)hash_descriptor[hash].hashsize) != 0) {
failed++;
#ifdef LTC_HMAC_TEST_DBG
#ifdef LTC_TEST_DBG
{
unsigned int j;
printf("\nHMAC-%s test %s:\n", cases[i].algo, cases[i].num);
printf( "Result: 0x");
for(j=0; j < hash_descriptor[hash].hashsize; j++) {
printf("%2x ", digest[j]);
}
printf("\nCorrect: 0x");
for(j=0; j < hash_descriptor[hash].hashsize; j++) {
printf("%2x ", cases[i].digest[j]);
}
printf("\n");
printf("\nHMAC-%s test %s: Failed\n", cases[i].algo, cases[i].num);
print_hex("is", digest, hash_descriptor[hash].hashsize);
print_hex("should", cases[i].digest, hash_descriptor[hash].hashsize);
return CRYPT_FAIL_TESTVECTOR;
}
#endif
#ifdef LTC_HMAC_TEST_DBG
#if LTC_TEST_DBG > 1
} else {
printf("HMAC-%s test %s: Passed\n", cases[i].algo, cases[i].num);
#endif
#endif
}
}