@@ -321,34 +321,50 @@ static int extract_fname_parts(const char* fname, uint32* part1, uint32* part2,
321321/* Encryption and decryption using AES in CTR mode */
322322static void cfs_aes_crypt_block (const char * fname ,void * block ,uint32 offs ,uint32 size )
323323{
324+ #define AES_DEBUG 1
324325uint32 aes_in [4 ];/* 16 bytes, 128 bits */
325326uint32 aes_out [4 ];
326327uint8 * plaintext = (uint8 * )block ;
327328uint8 * pgamma = (uint8 * )& aes_out ;
329+ rijndael_ctx temp_ctx = cfs_state -> aes_context ;
328330uint32 i ,fname_part1 ,fname_part2 ,fname_part3 ;
329331
330332if (extract_fname_parts (fname ,& fname_part1 ,& fname_part2 ,& fname_part3 )< 0 )
331333fname_part1 = fname_part2 = fname_part3 = 0 ;
332334
333- // AALEKSEEV TODO MAKE DEBUG4
335+ #ifdef AES_DEBUG
334336elog (LOG ,"cfs_aes_crypt_block, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d" ,
335337fname ,fname_part1 ,fname_part2 ,fname_part3 ,offs ,size );
338+ #endif
336339
337- aes_in [0 ]= fname_part1 ;
338- aes_in [1 ]= fname_part2 ;
339- aes_in [2 ]= fname_part3 ;
340+ aes_in [0 ]= 0 ; // fname_part1;
341+ aes_in [1 ]= 0 ; // fname_part2;
342+ aes_in [2 ]= 0 ; // fname_part3;
340343aes_in [3 ]= offs & 0xFFFFFFF0 ;
341- rijndael_encrypt (& cfs_state -> aes_context , (u4byte * )& aes_in , (u4byte * )& aes_out );
344+ rijndael_encrypt (& temp_ctx , (u4byte * )& aes_in , (u4byte * )& aes_out );
345+
346+ #ifdef AES_DEBUG
347+ elog (LOG ,"cfs_aes_crypt_block, in = %08X %08X %08X %08X, out = %08X %08X %08X %08X" ,
348+ aes_in [0 ],aes_in [1 ],aes_in [2 ],aes_in [3 ],
349+ aes_out [0 ],aes_out [1 ],aes_out [2 ],aes_out [3 ]);
350+ #endif
342351
343352for (i = 0 ;i < size ;i ++ )
344353{
345- plaintext [i ] ^=aes_out [offs & 0xF ];
354+ plaintext [i ] ^=pgamma [offs & 0xF ];
346355offs ++ ;
347356if ((offs & 0xF )== 0 )
348357{
349358/* Prepare next gamma part */
350359aes_in [3 ]= offs ;
351- rijndael_encrypt (& cfs_state -> aes_context , (u4byte * )& aes_in , (u4byte * )& aes_out );
360+ temp_ctx = cfs_state -> aes_context ;
361+ rijndael_encrypt (& temp_ctx , (u4byte * )& aes_in , (u4byte * )& aes_out );
362+
363+ #ifdef AES_DEBUG
364+ elog (LOG ,"cfs_aes_crypt_block, in = %08X %08X %08X %08X, out = %08X %08X %08X %08X" ,
365+ aes_in [0 ],aes_in [1 ],aes_in [2 ],aes_in [3 ],
366+ aes_out [0 ],aes_out [1 ],aes_out [2 ],aes_out [3 ]);
367+ #endif
352368}
353369}
354370}