Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9c2f304

Browse files
tirantiran
committed
Issue #26798: for loop initial declarations, take 2
1 parent 8482ce4 commit 9c2f304

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎Modules/_blake2/impl/blake2b-ref.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,12 @@ BLAKE2_LOCAL_INLINE(int) blake2b_init0( blake2b_state *S )
157157
int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
158158
{
159159
const uint8_t *p = ( const uint8_t * )( P );
160+
size_t i;
160161

161162
blake2b_init0( S );
162163

163164
/* IV XOR ParamBlock */
164-
for( size_t i = 0; i < 8; ++i )
165+
for( i = 0; i < 8; ++i )
165166
S->h[i] ^= load64( p + sizeof( S->h[i] ) * i );
166167

167168
return 0;
@@ -392,14 +393,15 @@ int main( int argc, char **argv )
392393
{
393394
uint8_t key[BLAKE2B_KEYBYTES];
394395
uint8_t buf[KAT_LENGTH];
396+
size_t i;
395397

396-
for( size_t i = 0; i < BLAKE2B_KEYBYTES; ++i )
398+
for( i = 0; i < BLAKE2B_KEYBYTES; ++i )
397399
key[i] = ( uint8_t )i;
398400

399-
for( size_t i = 0; i < KAT_LENGTH; ++i )
401+
for( i = 0; i < KAT_LENGTH; ++i )
400402
buf[i] = ( uint8_t )i;
401403

402-
for( size_t i = 0; i < KAT_LENGTH; ++i )
404+
for( i = 0; i < KAT_LENGTH; ++i )
403405
{
404406
uint8_t hash[BLAKE2B_OUTBYTES];
405407
blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES );

‎Modules/_blake2/impl/blake2b.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,14 +426,15 @@ int main( int argc, char **argv )
426426
{
427427
uint8_t key[BLAKE2B_KEYBYTES];
428428
uint8_t buf[KAT_LENGTH];
429+
size_t i;
429430

430-
for( size_t i = 0; i < BLAKE2B_KEYBYTES; ++i )
431+
for( i = 0; i < BLAKE2B_KEYBYTES; ++i )
431432
key[i] = ( uint8_t )i;
432433

433-
for( size_t i = 0; i < KAT_LENGTH; ++i )
434+
for( i = 0; i < KAT_LENGTH; ++i )
434435
buf[i] = ( uint8_t )i;
435436

436-
for( size_t i = 0; i < KAT_LENGTH; ++i )
437+
for( i = 0; i < KAT_LENGTH; ++i )
437438
{
438439
uint8_t hash[BLAKE2B_OUTBYTES];
439440
blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES );

‎Modules/_blake2/impl/blake2s-ref.c‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
154154
blake2s_init0( S );
155155

156156
/* IV XOR ParamBlock */
157-
for( size_t i = 0; i < 8; ++i )
157+
for( i = 0; i < 8; ++i )
158158
S->h[i] ^= load32( &p[i] );
159159

160160
return 0;
@@ -219,11 +219,12 @@ static int blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2S_BLOCK
219219
{
220220
uint32_t m[16];
221221
uint32_t v[16];
222+
size_t i;
222223

223-
for( size_t i = 0; i < 16; ++i )
224+
for( i = 0; i < 16; ++i )
224225
m[i] = load32( block + i * sizeof( m[i] ) );
225226

226-
for( size_t i = 0; i < 8; ++i )
227+
for( i = 0; i < 8; ++i )
227228
v[i] = S->h[i];
228229

229230
v[ 8] = blake2s_IV[0];
@@ -267,7 +268,7 @@ static int blake2s_compress( blake2s_state *S, const uint8_t block[BLAKE2S_BLOCK
267268
ROUND( 8 );
268269
ROUND( 9 );
269270

270-
for( size_t i = 0; i < 8; ++i )
271+
for( i = 0; i < 8; ++i )
271272
S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
272273

273274
#undef G
@@ -381,14 +382,15 @@ int main( int argc, char **argv )
381382
{
382383
uint8_t key[BLAKE2S_KEYBYTES];
383384
uint8_t buf[KAT_LENGTH];
385+
size_t i;
384386

385-
for( size_t i = 0; i < BLAKE2S_KEYBYTES; ++i )
387+
for( i = 0; i < BLAKE2S_KEYBYTES; ++i )
386388
key[i] = ( uint8_t )i;
387389

388-
for( size_t i = 0; i < KAT_LENGTH; ++i )
390+
for( i = 0; i < KAT_LENGTH; ++i )
389391
buf[i] = ( uint8_t )i;
390392

391-
for( size_t i = 0; i < KAT_LENGTH; ++i )
393+
for( i = 0; i < KAT_LENGTH; ++i )
392394
{
393395
uint8_t hash[BLAKE2S_OUTBYTES];
394396
blake2s( hash, buf, key, BLAKE2S_OUTBYTES, i, BLAKE2S_KEYBYTES );

‎Modules/_blake2/impl/blake2s.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,14 +407,15 @@ int main( int argc, char **argv )
407407
{
408408
uint8_t key[BLAKE2S_KEYBYTES];
409409
uint8_t buf[KAT_LENGTH];
410+
size_t i;
410411

411-
for( size_t i = 0; i < BLAKE2S_KEYBYTES; ++i )
412+
for( i = 0; i < BLAKE2S_KEYBYTES; ++i )
412413
key[i] = ( uint8_t )i;
413414

414-
for( size_t i = 0; i < KAT_LENGTH; ++i )
415+
for( i = 0; i < KAT_LENGTH; ++i )
415416
buf[i] = ( uint8_t )i;
416417

417-
for( size_t i = 0; i < KAT_LENGTH; ++i )
418+
for( i = 0; i < KAT_LENGTH; ++i )
418419
{
419420
uint8_t hash[BLAKE2S_OUTBYTES];
420421

0 commit comments

Comments
 (0)