Skip to content

Commit d16e5b0

Browse files
karel-msjaeckel
authored andcommitted
Merge pull request #379 from libtom/pr/clang-tidy-misc-misplaced-widening-cast
clang-tidy: misc-misplaced-widening-cast (cherry picked from commit 248352c) With back-ported patch from src/misc/copy_or_zeromem.c back to src/encauth/ccm/ccm_memory.c
1 parent 00dfe66 commit d16e5b0

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/encauth/ccm/ccm_memory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int ccm_memory(int cipher,
5252
int err;
5353
unsigned long len, L, x, y, z, CTRlen;
5454
#ifdef LTC_FAST
55-
LTC_FAST_TYPE fastMask = ~0; /* initialize fastMask at all zeroes */
55+
LTC_FAST_TYPE fastMask = ~(LTC_FAST_TYPE)0; /* initialize fastMask at all zeroes */
5656
#endif
5757
unsigned char mask = 0xff; /* initialize mask at all zeroes */
5858

src/pk/dsa/dsa_export.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ int dsa_export(unsigned char *out, unsigned long *outlen, int type, dsa_key *key
6969
}
7070
} else {
7171
if (std) {
72-
unsigned long tmplen = (mp_count_bits(key->y) / 8) + 8;
72+
unsigned long tmplen = (unsigned long)(mp_count_bits(key->y) / 8) + 8;
7373
unsigned char* tmp = XMALLOC(tmplen);
7474
ltc_asn1_list int_list[3];
7575

src/pk/dsa/dsa_generate_pqg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ static int _dsa_make_params(prng_state *prng, int wprng, int group_size, int mod
7272
*/
7373

7474
seedbytes = group_size;
75-
L = modulus_size * 8;
76-
N = group_size * 8;
75+
L = (unsigned long)modulus_size * 8;
76+
N = (unsigned long)group_size * 8;
7777

7878
/* XXX-TODO no Lucas test */
7979
#ifdef LTC_MPI_HAS_LUCAS_TEST

src/pk/rsa/rsa_export.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ int rsa_export(unsigned char *out, unsigned long *outlen, int type, rsa_key *key
5858
unsigned char* tmp = NULL;
5959

6060
if (type & PK_STD) {
61-
tmplen = (mp_count_bits(key->N)/8)*2+8;
61+
tmplen = (unsigned long)(mp_count_bits(key->N) / 8) * 2 + 8;
6262
tmp = XMALLOC(tmplen);
6363
ptmplen = &tmplen;
6464
if (tmp == NULL) {

0 commit comments

Comments
 (0)