From f6ea738feec7bed7c976e0871c65d36c21ad5f18 Mon Sep 17 00:00:00 2001 From: Karel Miko Date: Tue, 9 May 2017 21:29:39 +0200 Subject: [PATCH 1/3] fix: Loss of sign (initialization) (int to unsigned long long) --- src/encauth/ccm/ccm_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/encauth/ccm/ccm_memory.c b/src/encauth/ccm/ccm_memory.c index eb41f99..059bf35 100644 --- a/src/encauth/ccm/ccm_memory.c +++ b/src/encauth/ccm/ccm_memory.c @@ -54,7 +54,7 @@ int ccm_memory(int cipher, int err; unsigned long len, L, x, y, z, CTRlen; #ifdef LTC_FAST - LTC_FAST_TYPE fastMask = -1; /* initialize fastMask at all zeroes */ + LTC_FAST_TYPE fastMask = ~0; /* initialize fastMask at all zeroes */ #endif unsigned char mask = 0xff; /* initialize mask at all zeroes */ From 04262d3aec7bd15254369562cfcb68e909a6b936 Mon Sep 17 00:00:00 2001 From: Karel Miko Date: Tue, 9 May 2017 21:31:05 +0200 Subject: [PATCH 2/3] fix: local struct member 'poly_div' not referenced --- src/encauth/ocb3/ocb3_init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/encauth/ocb3/ocb3_init.c b/src/encauth/ocb3/ocb3_init.c index c73cb96..400c0a7 100644 --- a/src/encauth/ocb3/ocb3_init.c +++ b/src/encauth/ocb3/ocb3_init.c @@ -19,17 +19,13 @@ static const struct { int len; - unsigned char poly_div[MAXBLOCKSIZE], - poly_mul[MAXBLOCKSIZE]; + unsigned char poly_mul[MAXBLOCKSIZE]; } polys[] = { { 8, - { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D }, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B } }, { 16, - { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43 }, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87 } } From 91b61630be67fcf5f3dde956249dcc40ee35a1dd Mon Sep 17 00:00:00 2001 From: Karel Miko Date: Tue, 9 May 2017 21:43:28 +0200 Subject: [PATCH 3/3] improved #ifdefs - related to: 'num' not referenced --- src/misc/hkdf/hkdf_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/misc/hkdf/hkdf_test.c b/src/misc/hkdf/hkdf_test.c index c740b58..d4dcc78 100644 --- a/src/misc/hkdf/hkdf_test.c +++ b/src/misc/hkdf/hkdf_test.c @@ -265,7 +265,7 @@ 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) { -#if 0 +#ifdef LTC_TEST_DBG printf("LTC_HKDF-%s test #%d, %s\n", cases[i].Hash, i, error_to_string(err)); #endif return err; @@ -273,7 +273,7 @@ int hkdf_test(void) if(XMEMCMP(OKM, cases[i].OKM, (size_t)cases[i].OKM_l) != 0) { failed++; -#if 0 +#ifdef LTC_TEST_DBG { unsigned int j; printf("\nLTC_HKDF-%s test #%d:\n", cases[i].Hash, cases[i].num); @@ -288,10 +288,10 @@ int hkdf_test(void) printf("\n"); return CRYPT_ERROR; } -#endif -#if 0 +#if LTC_TEST_DBG > 1 } else { printf("LTC_HKDF-%s test #%d: Passed\n", cases[i].Hash, cases[i].num); +#endif #endif } }