fix

afiskon · afiskon · commit fdb514f8d20d · 2017-02-03T16:48:06.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -195,7 +195,7 @@ char const* cfs_algorithm()
 #endif
 
 
-static void cfs_rc4_encrypt_block(void* block, uint32 offs, uint32 block_size)
+static void cfs_rc4_encrypt_block(void* block, uint32 offs, uint32 block_size) // AALEKSEEV TODO: DELETE THIS
 {
 	uint32 i;
     uint8 temp;
@@ -318,31 +318,33 @@ static int extract_fname_parts(const char* fname, unsigned int* part1, unsigned
 	return 0;
 }
 
+/* Encryption and decryption using AES in CTR mode */
+static void cfs_aes_crypt_block(const char* fname, void* block, uint32 offs, uint32 size)
+{
+	unsigned int fname_part1, fname_part2, fname_part3;
+	if(extract_fname_parts(fname, &fname_part1, &fname_part2, &fname_part3) < 0)
+		fname_part1 = fname_part2 = fname_part3 = 0;
+
+	elog(LOG, "cfs_aes_crypt_block, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d",
+		fname, fname_part1, fname_part2, fname_part3, offs, size);
+
+}
+
 void cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size)
 {
 	if (cfs_encryption) 
 	{
-		unsigned int fname_part1, fname_part2, fname_part3;
-		if(extract_fname_parts(fname, &fname_part1, &fname_part2, &fname_part3) < 0)
-			fname_part1 = fname_part2 = fname_part3 = 0;
-
-		elog(LOG, "cfs_encrypt, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d",
-			fname, fname_part1, fname_part2, fname_part3, offs, size);
-		cfs_rc4_encrypt_block(block, offs, size);
+		cfs_rc4_encrypt_block(block, offs, size); // AALEKSEEV TODO DELETE
+		cfs_aes_crypt_block(fname, block, offs, size);
 	}
 }
 
 void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)
 {
 	if (cfs_encryption) 
 	{
-		unsigned int fname_part1, fname_part2, fname_part3;
-		if(extract_fname_parts(fname, &fname_part1, &fname_part2, &fname_part3) < 0)
-			fname_part1 = fname_part2 = fname_part3 = 0;
-
-		elog(LOG, "cfs_decrypt, fname = %s, part1 = %d, part2 = %d, part3 = %d, offs = %d, size = %d",
-			fname, fname_part1, fname_part2, fname_part3, offs, size);
-		cfs_rc4_encrypt_block(block, offs, size);
+		cfs_rc4_encrypt_block(block, offs, size); // AALEKSEEV TODO DELETE
+		cfs_aes_crypt_block(fname, block, offs, size);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ char const* cfs_algorithm()`
`195`	`195`	`#endif`
`196`	`196`
`197`	`197`
`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`
`199`	`199`	`{`
`200`	`200`	`uint32 i;`
`201`	`201`	`uint8 temp;`
`@@ -318,31 +318,33 @@ static int extract_fname_parts(const char* fname, unsigned int* part1, unsigned`
`318`	`318`	`return 0;`
`319`	`319`	`}`
`320`	`320`
	`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`	`+ unsigned int 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`	`+`
`321`	`333`	`void cfs_encrypt(const char* fname, void* block, uint32 offs, uint32 size)`
`322`	`334`	`{`
`323`	`335`	`if (cfs_encryption)`
`324`	`336`	`{`
`325`		`- unsigned int 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);`
`332`	`339`	`}`
`333`	`340`	`}`
`334`	`341`
`335`	`342`	`void cfs_decrypt(const char* fname, void* block, uint32 offs, uint32 size)`
`336`	`343`	`{`
`337`	`344`	`if (cfs_encryption)`
`338`	`345`	`{`
`339`		`- unsigned int 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);`
`346`	`348`	`}`
`347`	`349`	`}`
`348`	`350`