Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a5d7f9b

Browse files
committed
fix
1 parent 051e976 commit a5d7f9b

File tree

1 file changed

+5
-7
lines changed
  • src/backend/storage/file

1 file changed

+5
-7
lines changed

src/backend/storage/file/cfs.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ static void cfs_aes_crypt_block(const char* fname, void* block, uint32 offs, uin
326326
uint32 aes_out[4];
327327
uint8* plaintext = (uint8*)block;
328328
uint8* pgamma = (uint8*)&aes_out;
329-
rijndael_ctx temp_ctx = cfs_state->aes_context;
330329
uint32 i, fname_part1, fname_part2, fname_part3;
331330

332331
if(extract_fname_parts(fname, &fname_part1, &fname_part2, &fname_part3) < 0)
@@ -337,11 +336,11 @@ static void cfs_aes_crypt_block(const char* fname, void* block, uint32 offs, uin
337336
fname, fname_part1, fname_part2, fname_part3, offs, size);
338337
#endif
339338

340-
aes_in[0] = 0; // fname_part1;
341-
aes_in[1] = 0; // fname_part2;
342-
aes_in[2] = 0; // fname_part3;
339+
aes_in[0] = fname_part1;
340+
aes_in[1] = fname_part2;
341+
aes_in[2] = fname_part3;
343342
aes_in[3] = offs & 0xFFFFFFF0;
344-
rijndael_encrypt(&temp_ctx, (u4byte*)&aes_in, (u4byte*)&aes_out);
343+
rijndael_encrypt(&cfs_state->aes_context, (u4byte*)&aes_in, (u4byte*)&aes_out);
345344

346345
#ifdef AES_DEBUG
347346
elog(LOG, "cfs_aes_crypt_block, in = %08X %08X %08X %08X, out = %08X %08X %08X %08X",
@@ -357,8 +356,7 @@ static void cfs_aes_crypt_block(const char* fname, void* block, uint32 offs, uin
357356
{
358357
/* Prepare next gamma part */
359358
aes_in[3] = offs;
360-
temp_ctx = cfs_state->aes_context;
361-
rijndael_encrypt(&temp_ctx, (u4byte*)&aes_in, (u4byte*)&aes_out);
359+
rijndael_encrypt(&cfs_state->aes_context, (u4byte*)&aes_in, (u4byte*)&aes_out);
362360

363361
#ifdef AES_DEBUG
364362
elog(LOG, "cfs_aes_crypt_block, in = %08X %08X %08X %08X, out = %08X %08X %08X %08X",

0 commit comments

Comments
 (0)