Fix formatting in various code to match spacing from coding style
diff --git a/library/camellia.c b/library/camellia.c
index b5d5ecc..f1d4d6b 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -287,14 +287,14 @@
TK[2] = KC[(OFFSET) * 4 + 2]; \
TK[3] = KC[(OFFSET) * 4 + 3]; \
\
- for ( i = 1; i <= 4; i++ ) \
- if (shifts[(INDEX)][(OFFSET)][i -1]) \
- ROTL(TK + i * 4, TK, (15 * i) % 32); \
+ for( i = 1; i <= 4; i++ ) \
+ if( shifts[(INDEX)][(OFFSET)][i -1] ) \
+ ROTL(TK + i * 4, TK, ( 15 * i ) % 32); \
\
- for ( i = 0; i < 20; i++ ) \
- if (indexes[(INDEX)][(OFFSET)][i] != -1) { \
- RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ]; \
- } \
+ for( i = 0; i < 20; i++ ) \
+ if( indexes[(INDEX)][(OFFSET)][i] != -1 ) { \
+ RK[indexes[(INDEX)][(OFFSET)][i]] = TK[ i ]; \
+ } \
}
static void camellia_feistel( const uint32_t x[2], const uint32_t k[2],
@@ -338,8 +338,8 @@
RK = ctx->rk;
- memset(t, 0, 64);
- memset(RK, 0, sizeof(ctx->rk));
+ memset( t, 0, 64 );
+ memset( RK, 0, sizeof(ctx->rk) );
switch( keysize )
{
@@ -349,52 +349,52 @@
default : return( POLARSSL_ERR_CAMELLIA_INVALID_KEY_LENGTH );
}
- for( i = 0; i < keysize / 8; ++i)
+ for( i = 0; i < keysize / 8; ++i )
t[i] = key[i];
- if (keysize == 192) {
- for (i = 0; i < 8; i++)
+ if( keysize == 192 ) {
+ for( i = 0; i < 8; i++ )
t[24 + i] = ~t[16 + i];
}
/*
* Prepare SIGMA values
*/
- for (i = 0; i < 6; i++) {
- GET_UINT32_BE(SIGMA[i][0], SIGMA_CHARS[i], 0);
- GET_UINT32_BE(SIGMA[i][1], SIGMA_CHARS[i], 4);
+ for( i = 0; i < 6; i++ ) {
+ GET_UINT32_BE( SIGMA[i][0], SIGMA_CHARS[i], 0 );
+ GET_UINT32_BE( SIGMA[i][1], SIGMA_CHARS[i], 4 );
}
/*
* Key storage in KC
* Order: KL, KR, KA, KB
*/
- memset(KC, 0, sizeof(KC));
+ memset( KC, 0, sizeof(KC) );
/* Store KL, KR */
- for (i = 0; i < 8; i++)
- GET_UINT32_BE(KC[i], t, i * 4);
+ for( i = 0; i < 8; i++ )
+ GET_UINT32_BE( KC[i], t, i * 4 );
/* Generate KA */
- for( i = 0; i < 4; ++i)
+ for( i = 0; i < 4; ++i )
KC[8 + i] = KC[i] ^ KC[4 + i];
- camellia_feistel(KC + 8, SIGMA[0], KC + 10);
- camellia_feistel(KC + 10, SIGMA[1], KC + 8);
+ camellia_feistel( KC + 8, SIGMA[0], KC + 10 );
+ camellia_feistel( KC + 10, SIGMA[1], KC + 8 );
- for( i = 0; i < 4; ++i)
+ for( i = 0; i < 4; ++i )
KC[8 + i] ^= KC[i];
- camellia_feistel(KC + 8, SIGMA[2], KC + 10);
- camellia_feistel(KC + 10, SIGMA[3], KC + 8);
+ camellia_feistel( KC + 8, SIGMA[2], KC + 10 );
+ camellia_feistel( KC + 10, SIGMA[3], KC + 8 );
- if (keysize > 128) {
+ if( keysize > 128 ) {
/* Generate KB */
- for( i = 0; i < 4; ++i)
+ for( i = 0; i < 4; ++i )
KC[12 + i] = KC[4 + i] ^ KC[8 + i];
- camellia_feistel(KC + 12, SIGMA[4], KC + 14);
- camellia_feistel(KC + 14, SIGMA[5], KC + 12);
+ camellia_feistel( KC + 12, SIGMA[4], KC + 14 );
+ camellia_feistel( KC + 14, SIGMA[5], KC + 12 );
}
/*
@@ -402,24 +402,24 @@
*/
/* Manipulating KL */
- SHIFT_AND_PLACE(idx, 0);
+ SHIFT_AND_PLACE( idx, 0 );
/* Manipulating KR */
- if (keysize > 128) {
- SHIFT_AND_PLACE(idx, 1);
+ if( keysize > 128 ) {
+ SHIFT_AND_PLACE( idx, 1 );
}
/* Manipulating KA */
- SHIFT_AND_PLACE(idx, 2);
+ SHIFT_AND_PLACE( idx, 2 );
/* Manipulating KB */
- if (keysize > 128) {
- SHIFT_AND_PLACE(idx, 3);
+ if( keysize > 128 ) {
+ SHIFT_AND_PLACE( idx, 3 );
}
/* Do transpositions */
- for ( i = 0; i < 20; i++ ) {
- if (transposes[idx][i] != -1) {
+ for( i = 0; i < 20; i++ ) {
+ if( transposes[idx][i] != -1 ) {
RK[32 + 12 * idx + i] = RK[transposes[idx][i]];
}
}
@@ -441,7 +441,7 @@
int ret;
/* Also checks keysize */
- if( ( ret = camellia_setkey_enc(&cty, key, keysize) ) )
+ if( ( ret = camellia_setkey_enc( &cty, key, keysize ) ) )
return( ret );
ctx->nr = cty.nr;
@@ -455,7 +455,7 @@
*RK++ = *SK++;
*RK++ = *SK++;
- for (i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4)
+ for( i = 22 + 8 * idx, SK -= 6; i > 0; i--, SK -= 4 )
{
*RK++ = *SK++;
*RK++ = *SK++;
@@ -499,22 +499,22 @@
X[2] ^= *RK++;
X[3] ^= *RK++;
- while (NR) {
+ while( NR ) {
--NR;
- camellia_feistel(X, RK, X + 2);
+ camellia_feistel( X, RK, X + 2 );
RK += 2;
- camellia_feistel(X + 2, RK, X);
+ camellia_feistel( X + 2, RK, X );
RK += 2;
- camellia_feistel(X, RK, X + 2);
+ camellia_feistel( X, RK, X + 2 );
RK += 2;
- camellia_feistel(X + 2, RK, X);
+ camellia_feistel( X + 2, RK, X );
RK += 2;
- camellia_feistel(X, RK, X + 2);
+ camellia_feistel( X, RK, X + 2 );
RK += 2;
- camellia_feistel(X + 2, RK, X);
+ camellia_feistel( X + 2, RK, X );
RK += 2;
- if (NR) {
+ if( NR ) {
FL(X[0], X[1], RK[0], RK[1]);
RK += 2;
FLInv(X[2], X[3], RK[0], RK[1]);
@@ -615,7 +615,7 @@
*output++ = (unsigned char)( c ^ iv[n] );
iv[n] = (unsigned char) c;
- n = (n + 1) & 0x0F;
+ n = ( n + 1 ) & 0x0F;
}
}
else
@@ -627,7 +627,7 @@
iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
- n = (n + 1) & 0x0F;
+ n = ( n + 1 ) & 0x0F;
}
}
@@ -665,7 +665,7 @@
c = *input++;
*output++ = (unsigned char)( c ^ stream_block[n] );
- n = (n + 1) & 0x0F;
+ n = ( n + 1 ) & 0x0F;
}
*nc_off = n;
@@ -897,7 +897,7 @@
memset( key, 0, 32 );
- for (j = 0; j < 6; j++) {
+ for( j = 0; j < 6; j++ ) {
u = j >> 1;
v = j & 1;
@@ -905,20 +905,20 @@
polarssl_printf( " CAMELLIA-ECB-%3d (%s): ", 128 + u * 64,
(v == CAMELLIA_DECRYPT) ? "dec" : "enc");
- for (i = 0; i < CAMELLIA_TESTS_ECB; i++ ) {
- memcpy( key, camellia_test_ecb_key[u][i], 16 + 8 * u);
+ for( i = 0; i < CAMELLIA_TESTS_ECB; i++ ) {
+ memcpy( key, camellia_test_ecb_key[u][i], 16 + 8 * u );
- if (v == CAMELLIA_DECRYPT) {
- camellia_setkey_dec(&ctx, key, 128 + u * 64);
- memcpy(src, camellia_test_ecb_cipher[u][i], 16);
- memcpy(dst, camellia_test_ecb_plain[i], 16);
+ if( v == CAMELLIA_DECRYPT ) {
+ camellia_setkey_dec( &ctx, key, 128 + u * 64 );
+ memcpy( src, camellia_test_ecb_cipher[u][i], 16 );
+ memcpy( dst, camellia_test_ecb_plain[i], 16 );
} else { /* CAMELLIA_ENCRYPT */
- camellia_setkey_enc(&ctx, key, 128 + u * 64);
- memcpy(src, camellia_test_ecb_plain[i], 16);
- memcpy(dst, camellia_test_ecb_cipher[u][i], 16);
+ camellia_setkey_enc( &ctx, key, 128 + u * 64 );
+ memcpy( src, camellia_test_ecb_plain[i], 16 );
+ memcpy( dst, camellia_test_ecb_cipher[u][i], 16 );
}
- camellia_crypt_ecb(&ctx, v, src, buf);
+ camellia_crypt_ecb( &ctx, v, src, buf );
if( memcmp( buf, dst, 16 ) != 0 )
{
@@ -949,29 +949,29 @@
polarssl_printf( " CAMELLIA-CBC-%3d (%s): ", 128 + u * 64,
( v == CAMELLIA_DECRYPT ) ? "dec" : "enc" );
- memcpy( src, camellia_test_cbc_iv, 16);
- memcpy( dst, camellia_test_cbc_iv, 16);
- memcpy( key, camellia_test_cbc_key[u], 16 + 8 * u);
+ memcpy( src, camellia_test_cbc_iv, 16 );
+ memcpy( dst, camellia_test_cbc_iv, 16 );
+ memcpy( key, camellia_test_cbc_key[u], 16 + 8 * u );
- if (v == CAMELLIA_DECRYPT) {
- camellia_setkey_dec(&ctx, key, 128 + u * 64);
+ if( v == CAMELLIA_DECRYPT ) {
+ camellia_setkey_dec( &ctx, key, 128 + u * 64 );
} else {
- camellia_setkey_enc(&ctx, key, 128 + u * 64);
+ camellia_setkey_enc( &ctx, key, 128 + u * 64 );
}
- for (i = 0; i < CAMELLIA_TESTS_CBC; i++ ) {
+ for( i = 0; i < CAMELLIA_TESTS_CBC; i++ ) {
- if (v == CAMELLIA_DECRYPT) {
+ if( v == CAMELLIA_DECRYPT ) {
memcpy( iv , src, 16 );
- memcpy(src, camellia_test_cbc_cipher[u][i], 16);
- memcpy(dst, camellia_test_cbc_plain[i], 16);
+ memcpy( src, camellia_test_cbc_cipher[u][i], 16 );
+ memcpy( dst, camellia_test_cbc_plain[i], 16 );
} else { /* CAMELLIA_ENCRYPT */
memcpy( iv , dst, 16 );
- memcpy(src, camellia_test_cbc_plain[i], 16);
- memcpy(dst, camellia_test_cbc_cipher[u][i], 16);
+ memcpy( src, camellia_test_cbc_plain[i], 16 );
+ memcpy( dst, camellia_test_cbc_cipher[u][i], 16 );
}
- camellia_crypt_cbc(&ctx, v, 16, iv, src, buf);
+ camellia_crypt_cbc( &ctx, v, 16, iv, src, buf );
if( memcmp( buf, dst, 16 ) != 0 )
{