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/encauth/ccm/ccm_test.c
+5 -9
View File
@@ -17,10 +17,6 @@
#ifdef LTC_CCM_MODE
#if defined(LTC_CCM_TEST_DBG) && !defined(LTC_NO_TEST)
void print_hex(const char* what, const unsigned char* p, const unsigned long l);
#endif
int ccm_test(void)
{
#ifndef LTC_TEST
@@ -168,7 +164,7 @@ int ccm_test(void)
}
if (XMEMCMP(buf, tests[x].ct, tests[x].ptlen)) {
#if defined(LTC_CCM_TEST_DBG)
#if defined(LTC_TEST_DBG)
printf("\n%d: x=%lu y=%lu\n", __LINE__, x, y);
print_hex("ct is ", tag, taglen);
print_hex("ct should", tests[x].tag, taglen);
@@ -176,14 +172,14 @@ int ccm_test(void)
return CRYPT_FAIL_TESTVECTOR;
}
if (tests[x].taglen != taglen) {
#if defined(LTC_CCM_TEST_DBG)
#if defined(LTC_TEST_DBG)
printf("\n%d: x=%lu y=%lu\n", __LINE__, x, y);
printf("taglen %lu (is) %lu (should)\n", taglen, tests[x].taglen);
#endif
return CRYPT_FAIL_TESTVECTOR;
}
if (XMEMCMP(tag, tests[x].tag, tests[x].taglen)) {
#if defined(LTC_CCM_TEST_DBG)
#if defined(LTC_TEST_DBG)
printf("\n%d: x=%lu y=%lu\n", __LINE__, x, y);
print_hex("tag is ", tag, tests[x].taglen);
print_hex("tag should", tests[x].tag, tests[x].taglen);
@@ -221,7 +217,7 @@ int ccm_test(void)
}
if (XMEMCMP(buf2, tests[x].pt, tests[x].ptlen)) {
#if defined(LTC_CCM_TEST_DBG)
#if defined(LTC_TEST_DBG)
printf("\n%d: x=%lu y=%lu\n", __LINE__, x, y);
print_hex("pt is ", tag, taglen);
print_hex("pt should", tests[x].tag, taglen);
@@ -229,7 +225,7 @@ int ccm_test(void)
return CRYPT_FAIL_TESTVECTOR;
}
if (XMEMCMP(tag2, tests[x].tag, tests[x].taglen)) {
#if defined(LTC_CCM_TEST_DBG)
#if defined(LTC_TEST_DBG)
printf("\n%d: x=%lu y=%lu\n", __LINE__, x, y);
print_hex("tag is ", tag, tests[x].taglen);
print_hex("tag should", tests[x].tag, tests[x].taglen);