code formatting

main
JP Aumasson 2014-03-23 12:22:30 +01:00
parent e1e923ecef
commit d39aafe416
2 changed files with 21 additions and 15 deletions

View File

@ -82,7 +82,9 @@ int siphash( unsigned char *out, const unsigned char *in, unsigned long long in
printf( "(%3d) compress %08x %08x\n", ( int )inlen, ( u32 )( m >> 32 ), ( u32 )m ); printf( "(%3d) compress %08x %08x\n", ( int )inlen, ( u32 )( m >> 32 ), ( u32 )m );
#endif #endif
v3 ^= m; v3 ^= m;
for( i=0; i<cROUNDS; ++i ) SIPROUND; for( i=0; i<cROUNDS; ++i ) SIPROUND;
v0 ^= m; v0 ^= m;
} }
@ -113,7 +115,9 @@ int siphash( unsigned char *out, const unsigned char *in, unsigned long long in
printf( "(%3d) padding %08x %08x\n", ( int )inlen, ( u32 )( b >> 32 ), ( u32 )b ); printf( "(%3d) padding %08x %08x\n", ( int )inlen, ( u32 )( b >> 32 ), ( u32 )b );
#endif #endif
v3 ^= b; v3 ^= b;
for( i=0; i<cROUNDS; ++i ) SIPROUND; for( i=0; i<cROUNDS; ++i ) SIPROUND;
v0 ^= b; v0 ^= b;
#ifdef DEBUG #ifdef DEBUG
printf( "(%3d) v0 %08x %08x\n", ( int )inlen, ( u32 )( v0 >> 32 ), ( u32 )v0 ); printf( "(%3d) v0 %08x %08x\n", ( int )inlen, ( u32 )( v0 >> 32 ), ( u32 )v0 );
@ -122,7 +126,9 @@ int siphash( unsigned char *out, const unsigned char *in, unsigned long long in
printf( "(%3d) v3 %08x %08x\n", ( int )inlen, ( u32 )( v3 >> 32 ), ( u32 )v3 ); printf( "(%3d) v3 %08x %08x\n", ( int )inlen, ( u32 )( v3 >> 32 ), ( u32 )v3 );
#endif #endif
v2 ^= 0xff; v2 ^= 0xff;
for( i=0; i<dROUNDS; ++i ) SIPROUND; for( i=0; i<dROUNDS; ++i ) SIPROUND;
b = v0 ^ v1 ^ v2 ^ v3; b = v0 ^ v1 ^ v2 ^ v3;
U64TO8_LE( out, b ); U64TO8_LE( out, b );
return 0; return 0;