Skip to content

Commit 87bf0fe

Browse files
tirantiran
committed
Issue python#26798: for loop initial declarations are only allowed in C99 or C11 mode
1 parent 90493ab commit 87bf0fe

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,10 @@ BLAKE2_LOCAL_INLINE(int) blake2b_param_set_personal( blake2b_param *P, const uin
145145

146146
BLAKE2_LOCAL_INLINE(int) blake2b_init0( blake2b_state *S )
147147
{
148+
int i;
148149
memset( S, 0, sizeof( blake2b_state ) );
149150

150-
for( int i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
151+
for( i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
151152

152153
return 0;
153154
}
@@ -319,6 +320,7 @@ int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
319320
int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
320321
{
321322
uint8_t buffer[BLAKE2B_OUTBYTES] = {0};
323+
int i;
322324

323325
if( out == NULL || outlen == 0 || outlen > BLAKE2B_OUTBYTES )
324326
return -1;
@@ -339,7 +341,7 @@ int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
339341
memset( S->buf + S->buflen, 0, 2 * BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */
340342
blake2b_compress( S, S->buf );
341343

342-
for( int i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
344+
for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
343345
store64( buffer + sizeof( S->h[i] ) * i, S->h[i] );
344346

345347
memcpy( out, buffer, outlen );

‎Modules/_blake2/impl/blake2b.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,10 @@ BLAKE2_LOCAL_INLINE(int) blake2b_param_set_personal( blake2b_param *P, const uin
174174

175175
BLAKE2_LOCAL_INLINE(int) blake2b_init0( blake2b_state *S )
176176
{
177+
int i;
177178
memset( S, 0, sizeof( blake2b_state ) );
178179

179-
for( int i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
180+
for( i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
180181

181182
return 0;
182183
}
@@ -188,10 +189,11 @@ int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
188189
const uint8_t * v = ( const uint8_t * )( blake2b_IV );
189190
const uint8_t * p = ( const uint8_t * )( P );
190191
uint8_t * h = ( uint8_t * )( S->h );
192+
int i;
191193
/* IV XOR ParamBlock */
192194
memset( S, 0, sizeof( blake2b_state ) );
193195

194-
for( int i = 0; i < BLAKE2B_OUTBYTES; ++i ) h[i] = v[i] ^ p[i];
196+
for( i = 0; i < BLAKE2B_OUTBYTES; ++i ) h[i] = v[i] ^ p[i];
195197

196198
return 0;
197199
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,10 @@ BLAKE2_LOCAL_INLINE(int) blake2s_param_set_personal( blake2s_param *P, const uin
138138

139139
BLAKE2_LOCAL_INLINE(int) blake2s_init0( blake2s_state *S )
140140
{
141+
int i;
141142
memset( S, 0, sizeof( blake2s_state ) );
142143

143-
for( int i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i];
144+
for( i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i];
144145

145146
return 0;
146147
}
@@ -308,6 +309,7 @@ int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen )
308309
int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
309310
{
310311
uint8_t buffer[BLAKE2S_OUTBYTES] = {0};
312+
int i;
311313

312314
if( out == NULL || outlen == 0 || outlen > BLAKE2S_OUTBYTES )
313315
return -1;
@@ -329,7 +331,7 @@ int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
329331
memset( S->buf + S->buflen, 0, 2 * BLAKE2S_BLOCKBYTES - S->buflen ); /* Padding */
330332
blake2s_compress( S, S->buf );
331333

332-
for( int i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
334+
for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
333335
store32( buffer + sizeof( S->h[i] ) * i, S->h[i] );
334336

335337
memcpy( out, buffer, outlen );

‎Modules/_blake2/impl/blake2s.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,10 @@ BLAKE2_LOCAL_INLINE(int) blake2s_param_set_personal( blake2s_param *P, const uin
161161

162162
BLAKE2_LOCAL_INLINE(int) blake2s_init0( blake2s_state *S )
163163
{
164+
int i;
164165
memset( S, 0, sizeof( blake2s_state ) );
165166

166-
for( int i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i];
167+
for( i = 0; i < 8; ++i ) S->h[i] = blake2s_IV[i];
167168

168169
return 0;
169170
}
@@ -175,10 +176,11 @@ int blake2s_init_param( blake2s_state *S, const blake2s_param *P )
175176
const uint8_t * v = ( const uint8_t * )( blake2s_IV );
176177
const uint8_t * p = ( const uint8_t * )( P );
177178
uint8_t * h = ( uint8_t * )( S->h );
179+
int i;
178180
/* IV XOR ParamBlock */
179181
memset( S, 0, sizeof( blake2s_state ) );
180182

181-
for( int i = 0; i < BLAKE2S_OUTBYTES; ++i ) h[i] = v[i] ^ p[i];
183+
for( i = 0; i < BLAKE2S_OUTBYTES; ++i ) h[i] = v[i] ^ p[i];
182184

183185
return 0;
184186
}
@@ -333,6 +335,7 @@ int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen )
333335
int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
334336
{
335337
uint8_t buffer[BLAKE2S_OUTBYTES] = {0};
338+
int i;
336339

337340
if( outlen > BLAKE2S_OUTBYTES )
338341
return -1;
@@ -353,7 +356,7 @@ int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen )
353356
memset( S->buf + S->buflen, 0, 2 * BLAKE2S_BLOCKBYTES - S->buflen ); /* Padding */
354357
blake2s_compress( S, S->buf );
355358

356-
for( int i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
359+
for( i = 0; i < 8; ++i ) /* Output full hash to temp buffer */
357360
store32( buffer + sizeof( S->h[i] ) * i, S->h[i] );
358361

359362
memcpy( out, buffer, outlen );

0 commit comments

Comments
 (0)