Skip to content

Commit 48ad48f

Browse files
karel-mkarel-m
authored
Merge pull request #417 from libtom/pr/clang-tidy-readability-inconsistent-declaration-parameter-name
fix clang-tidy warning: inconsistent-declaration-parameter-name
2 parents 168f3bd + 12c3091 commit 48ad48f

File tree

12 files changed

+174
-174
lines changed

12 files changed

+174
-174
lines changed

‎src/ciphers/safer/safer.c‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -176,94 +176,94 @@ static void Safer_Expand_Userkey(const unsigned char *userkey_1,
176176
}
177177
#endif
178178

179-
int safer_k64_setup(const unsigned char *key, int keylen, int numrounds, symmetric_key *skey)
179+
int safer_k64_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
180180
{
181181
LTC_ARGCHK(key != NULL);
182182
LTC_ARGCHK(skey != NULL);
183183

184-
if (numrounds != 0 && (numrounds < 6 || numrounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
184+
if (num_rounds != 0 && (num_rounds < 6 || num_rounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
185185
return CRYPT_INVALID_ROUNDS;
186186
}
187187

188188
if (keylen != 8) {
189189
return CRYPT_INVALID_KEYSIZE;
190190
}
191191

192-
Safer_Expand_Userkey(key, key, (unsigned int)(numrounds != 0 ?numrounds:LTC_SAFER_K64_DEFAULT_NOF_ROUNDS), 0, skey->safer.key);
192+
Safer_Expand_Userkey(key, key, (unsigned int)(num_rounds != 0 ?num_rounds:LTC_SAFER_K64_DEFAULT_NOF_ROUNDS), 0, skey->safer.key);
193193
return CRYPT_OK;
194194
}
195195

196-
int safer_sk64_setup(const unsigned char *key, int keylen, int numrounds, symmetric_key *skey)
196+
int safer_sk64_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
197197
{
198198
LTC_ARGCHK(key != NULL);
199199
LTC_ARGCHK(skey != NULL);
200200

201-
if (numrounds != 0 && (numrounds < 6 || numrounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
201+
if (num_rounds != 0 && (num_rounds < 6 || num_rounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
202202
return CRYPT_INVALID_ROUNDS;
203203
}
204204

205205
if (keylen != 8) {
206206
return CRYPT_INVALID_KEYSIZE;
207207
}
208208

209-
Safer_Expand_Userkey(key, key, (unsigned int)(numrounds != 0 ?numrounds:LTC_SAFER_SK64_DEFAULT_NOF_ROUNDS), 1, skey->safer.key);
209+
Safer_Expand_Userkey(key, key, (unsigned int)(num_rounds != 0 ?num_rounds:LTC_SAFER_SK64_DEFAULT_NOF_ROUNDS), 1, skey->safer.key);
210210
return CRYPT_OK;
211211
}
212212

213-
int safer_k128_setup(const unsigned char *key, int keylen, int numrounds, symmetric_key *skey)
213+
int safer_k128_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
214214
{
215215
LTC_ARGCHK(key != NULL);
216216
LTC_ARGCHK(skey != NULL);
217217

218-
if (numrounds != 0 && (numrounds < 6 || numrounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
218+
if (num_rounds != 0 && (num_rounds < 6 || num_rounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
219219
return CRYPT_INVALID_ROUNDS;
220220
}
221221

222222
if (keylen != 16) {
223223
return CRYPT_INVALID_KEYSIZE;
224224
}
225225

226-
Safer_Expand_Userkey(key, key+8, (unsigned int)(numrounds != 0 ?numrounds:LTC_SAFER_K128_DEFAULT_NOF_ROUNDS), 0, skey->safer.key);
226+
Safer_Expand_Userkey(key, key+8, (unsigned int)(num_rounds != 0 ?num_rounds:LTC_SAFER_K128_DEFAULT_NOF_ROUNDS), 0, skey->safer.key);
227227
return CRYPT_OK;
228228
}
229229

230-
int safer_sk128_setup(const unsigned char *key, int keylen, int numrounds, symmetric_key *skey)
230+
int safer_sk128_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey)
231231
{
232232
LTC_ARGCHK(key != NULL);
233233
LTC_ARGCHK(skey != NULL);
234234

235-
if (numrounds != 0 && (numrounds < 6 || numrounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
235+
if (num_rounds != 0 && (num_rounds < 6 || num_rounds > LTC_SAFER_MAX_NOF_ROUNDS)) {
236236
return CRYPT_INVALID_ROUNDS;
237237
}
238238

239239
if (keylen != 16) {
240240
return CRYPT_INVALID_KEYSIZE;
241241
}
242242

243-
Safer_Expand_Userkey(key, key+8, (unsigned int)(numrounds != 0?numrounds:LTC_SAFER_SK128_DEFAULT_NOF_ROUNDS), 1, skey->safer.key);
243+
Safer_Expand_Userkey(key, key+8, (unsigned int)(num_rounds != 0?num_rounds:LTC_SAFER_SK128_DEFAULT_NOF_ROUNDS), 1, skey->safer.key);
244244
return CRYPT_OK;
245245
}
246246

247247
#ifdef LTC_CLEAN_STACK
248-
static int _safer_ecb_encrypt(const unsigned char *block_in,
249-
unsigned char *block_out,
248+
static int _safer_ecb_encrypt(const unsigned char *pt,
249+
unsigned char *ct,
250250
const symmetric_key *skey)
251251
#else
252-
int safer_ecb_encrypt(const unsigned char *block_in,
253-
unsigned char *block_out,
252+
int safer_ecb_encrypt(const unsigned char *pt,
253+
unsigned char *ct,
254254
const symmetric_key *skey)
255255
#endif
256256
{ unsigned char a, b, c, d, e, f, g, h, t;
257257
unsigned int round;
258258
const unsigned char *key;
259259

260-
LTC_ARGCHK(block_in != NULL);
261-
LTC_ARGCHK(block_out != NULL);
260+
LTC_ARGCHK(pt != NULL);
261+
LTC_ARGCHK(ct != NULL);
262262
LTC_ARGCHK(skey != NULL);
263263

264264
key = skey->safer.key;
265-
a = block_in[0]; b = block_in[1]; c = block_in[2]; d = block_in[3];
266-
e = block_in[4]; f = block_in[5]; g = block_in[6]; h = block_in[7];
265+
a = pt[0]; b = pt[1]; c = pt[2]; d = pt[3];
266+
e = pt[4]; f = pt[5]; g = pt[6]; h = pt[7];
267267
if (LTC_SAFER_MAX_NOF_ROUNDS < (round = *key)) round = LTC_SAFER_MAX_NOF_ROUNDS;
268268
while(round-- > 0)
269269
{
@@ -280,44 +280,44 @@ int safer_ecb_encrypt(const unsigned char *block_in,
280280
}
281281
a ^= *++key; b += *++key; c += *++key; d ^= *++key;
282282
e ^= *++key; f += *++key; g += *++key; h ^= *++key;
283-
block_out[0] = a & 0xFF; block_out[1] = b & 0xFF;
284-
block_out[2] = c & 0xFF; block_out[3] = d & 0xFF;
285-
block_out[4] = e & 0xFF; block_out[5] = f & 0xFF;
286-
block_out[6] = g & 0xFF; block_out[7] = h & 0xFF;
283+
ct[0] = a & 0xFF; ct[1] = b & 0xFF;
284+
ct[2] = c & 0xFF; ct[3] = d & 0xFF;
285+
ct[4] = e & 0xFF; ct[5] = f & 0xFF;
286+
ct[6] = g & 0xFF; ct[7] = h & 0xFF;
287287
return CRYPT_OK;
288288
}
289289

290290
#ifdef LTC_CLEAN_STACK
291-
int safer_ecb_encrypt(const unsigned char *block_in,
292-
unsigned char *block_out,
291+
int safer_ecb_encrypt(const unsigned char *pt,
292+
unsigned char *ct,
293293
const symmetric_key *skey)
294294
{
295-
int err = _safer_ecb_encrypt(block_in, block_out, skey);
295+
int err = _safer_ecb_encrypt(pt, ct, skey);
296296
burn_stack(sizeof(unsigned char) * 9 + sizeof(unsigned int) + sizeof(unsigned char *));
297297
return err;
298298
}
299299
#endif
300300

301301
#ifdef LTC_CLEAN_STACK
302-
static int _safer_ecb_decrypt(const unsigned char *block_in,
303-
unsigned char *block_out,
302+
static int _safer_ecb_decrypt(const unsigned char *ct,
303+
unsigned char *pt,
304304
const symmetric_key *skey)
305305
#else
306-
int safer_ecb_decrypt(const unsigned char *block_in,
307-
unsigned char *block_out,
306+
int safer_ecb_decrypt(const unsigned char *ct,
307+
unsigned char *pt,
308308
const symmetric_key *skey)
309309
#endif
310310
{ unsigned char a, b, c, d, e, f, g, h, t;
311311
unsigned int round;
312312
const unsigned char *key;
313313

314-
LTC_ARGCHK(block_in != NULL);
315-
LTC_ARGCHK(block_out != NULL);
314+
LTC_ARGCHK(ct != NULL);
315+
LTC_ARGCHK(pt != NULL);
316316
LTC_ARGCHK(skey != NULL);
317317

318318
key = skey->safer.key;
319-
a = block_in[0]; b = block_in[1]; c = block_in[2]; d = block_in[3];
320-
e = block_in[4]; f = block_in[5]; g = block_in[6]; h = block_in[7];
319+
a = ct[0]; b = ct[1]; c = ct[2]; d = ct[3];
320+
e = ct[4]; f = ct[5]; g = ct[6]; h = ct[7];
321321
if (LTC_SAFER_MAX_NOF_ROUNDS < (round = *key)) round = LTC_SAFER_MAX_NOF_ROUNDS;
322322
key += LTC_SAFER_BLOCK_LEN * (1 + 2 * round);
323323
h ^= *key; g -= *--key; f -= *--key; e ^= *--key;
@@ -335,19 +335,19 @@ int safer_ecb_decrypt(const unsigned char *block_in,
335335
d = LOG(d) ^ *--key; c = EXP(c) - *--key;
336336
b = EXP(b) - *--key; a = LOG(a) ^ *--key;
337337
}
338-
block_out[0] = a & 0xFF; block_out[1] = b & 0xFF;
339-
block_out[2] = c & 0xFF; block_out[3] = d & 0xFF;
340-
block_out[4] = e & 0xFF; block_out[5] = f & 0xFF;
341-
block_out[6] = g & 0xFF; block_out[7] = h & 0xFF;
338+
pt[0] = a & 0xFF; pt[1] = b & 0xFF;
339+
pt[2] = c & 0xFF; pt[3] = d & 0xFF;
340+
pt[4] = e & 0xFF; pt[5] = f & 0xFF;
341+
pt[6] = g & 0xFF; pt[7] = h & 0xFF;
342342
return CRYPT_OK;
343343
}
344344

345345
#ifdef LTC_CLEAN_STACK
346-
int safer_ecb_decrypt(const unsigned char *block_in,
347-
unsigned char *block_out,
346+
int safer_ecb_decrypt(const unsigned char *ct,
347+
unsigned char *pt,
348348
const symmetric_key *skey)
349349
{
350-
int err = _safer_ecb_decrypt(block_in, block_out, skey);
350+
int err = _safer_ecb_decrypt(ct, pt, skey);
351351
burn_stack(sizeof(unsigned char) * 9 + sizeof(unsigned int) + sizeof(unsigned char *));
352352
return err;
353353
}

‎src/hashes/chc/chc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static int chc_compress(hash_state *md, const unsigned char *buf)
160160
@param len The length of the data (octets)
161161
@return CRYPT_OK if successful
162162
*/
163-
static int _chc_process(hash_state * md, const unsigned char *buf, unsigned long len);
163+
static int _chc_process(hash_state * md, const unsigned char *in, unsigned long inlen);
164164
static HASH_PROCESS(_chc_process, chc_compress, chc, (unsigned long)cipher_blocksize)
165165

166166
/**

‎src/hashes/sha3.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,16 +313,16 @@ int sha3_process(hash_state *md, const unsigned char *in, unsigned long inlen)
313313
}
314314

315315
#ifdef LTC_SHA3
316-
int sha3_done(hash_state *md, unsigned char *hash)
316+
int sha3_done(hash_state *md, unsigned char *out)
317317
{
318-
return _done(md, hash, CONST64(0x06));
318+
return _done(md, out, CONST64(0x06));
319319
}
320320
#endif
321321

322322
#ifdef LTC_KECCAK
323-
int keccak_done(hash_state *md, unsigned char *hash)
323+
int keccak_done(hash_state *md, unsigned char *out)
324324
{
325-
return _done(md, hash, CONST64(0x01));
325+
return _done(md, out, CONST64(0x01));
326326
}
327327
#endif
328328

‎src/headers/tomcrypt_cipher.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -673,8 +673,8 @@ int safer_k64_setup(const unsigned char *key, int keylen, int num_rounds, symmet
673673
int safer_sk64_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
674674
int safer_k128_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
675675
int safer_sk128_setup(const unsigned char *key, int keylen, int num_rounds, symmetric_key *skey);
676-
int safer_ecb_encrypt(const unsigned char *pt, unsigned char *ct, const symmetric_key *key);
677-
int safer_ecb_decrypt(const unsigned char *ct, unsigned char *pt, const symmetric_key *key);
676+
int safer_ecb_encrypt(const unsigned char *pt, unsigned char *ct, const symmetric_key *skey);
677+
int safer_ecb_decrypt(const unsigned char *ct, unsigned char *pt, const symmetric_key *skey);
678678
int safer_k64_test(void);
679679
int safer_sk64_test(void);
680680
int safer_sk128_test(void);
@@ -1057,7 +1057,7 @@ typedef struct {
10571057

10581058
int sosemanuk_setup(sosemanuk_state *ss, const unsigned char *key, unsigned long keylen);
10591059
int sosemanuk_setiv(sosemanuk_state *ss, const unsigned char *iv, unsigned long ivlen);
1060-
int sosemanuk_crypt(sosemanuk_state *ss, const unsigned char *in, unsigned long datalen, unsigned char *out);
1060+
int sosemanuk_crypt(sosemanuk_state *ss, const unsigned char *in, unsigned long inlen, unsigned char *out);
10611061
int sosemanuk_keystream(sosemanuk_state *ss, unsigned char *out, unsigned long outlen);
10621062
int sosemanuk_done(sosemanuk_state *ss);
10631063
int sosemanuk_test(void);

0 commit comments

Comments
 (0)