@@ -195,7 +195,7 @@ char const* cfs_algorithm()
195195#endif
196196
197197
198- static void cfs_rc4_encrypt_block (void * block ,uint32 offs ,uint32 block_size )
198+ static void cfs_rc4_encrypt_block (void * block ,uint32 offs ,uint32 block_size )// AALEKSEEV TODO: DELETE THIS
199199{
200200uint32 i ;
201201uint8 temp ;
@@ -318,31 +318,33 @@ static int extract_fname_parts(const char* fname, unsigned int* part1, unsigned
318318return 0 ;
319319}
320320
321+ /* Encryption and decryption using AES in CTR mode */
322+ static void cfs_aes_crypt_block (const char * fname ,void * block ,uint32 offs ,uint32 size )
323+ {
324+ unsignedint fname_part1 ,fname_part2 ,fname_part3 ;
325+ if (extract_fname_parts (fname ,& fname_part1 ,& fname_part2 ,& fname_part3 )< 0 )
326+ fname_part1 = fname_part2 = fname_part3 = 0 ;
327+
328+ elog (LOG ,"cfs_aes_crypt_block, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d" ,
329+ fname ,fname_part1 ,fname_part2 ,fname_part3 ,offs ,size );
330+
331+ }
332+
321333void cfs_encrypt (const char * fname ,void * block ,uint32 offs ,uint32 size )
322334{
323335if (cfs_encryption )
324336{
325- unsignedint fname_part1 ,fname_part2 ,fname_part3 ;
326- if (extract_fname_parts (fname ,& fname_part1 ,& fname_part2 ,& fname_part3 )< 0 )
327- fname_part1 = fname_part2 = fname_part3 = 0 ;
328-
329- elog (LOG ,"cfs_encrypt, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d" ,
330- fname ,fname_part1 ,fname_part2 ,fname_part3 ,offs ,size );
331- cfs_rc4_encrypt_block (block ,offs ,size );
337+ cfs_rc4_encrypt_block (block ,offs ,size );// AALEKSEEV TODO DELETE
338+ cfs_aes_crypt_block (fname ,block ,offs ,size );
332339}
333340}
334341
335342void cfs_decrypt (const char * fname ,void * block ,uint32 offs ,uint32 size )
336343{
337344if (cfs_encryption )
338345{
339- unsignedint fname_part1 ,fname_part2 ,fname_part3 ;
340- if (extract_fname_parts (fname ,& fname_part1 ,& fname_part2 ,& fname_part3 )< 0 )
341- fname_part1 = fname_part2 = fname_part3 = 0 ;
342-
343- elog (LOG ,"cfs_decrypt, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d" ,
344- fname ,fname_part1 ,fname_part2 ,fname_part3 ,offs ,size );
345- cfs_rc4_encrypt_block (block ,offs ,size );
346+ cfs_rc4_encrypt_block (block ,offs ,size );// AALEKSEEV TODO DELETE
347+ cfs_aes_crypt_block (fname ,block ,offs ,size );
346348}
347349}
348350