fix

afiskon · afiskon · commit fb24dbb9fab3 · 2017-02-03T16:37:20.000+03:00
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -224,7 +224,7 @@ static void cfs_rc4_encrypt_block(void* block, uint32 offs, uint32 block_size)
     }
 }
 
-static void cfs_rc4_init(void)
+static void cfs_crypto_init(void)
 {
     int index1 = 0;
     int index2 = 0;
@@ -233,6 +233,7 @@ static void cfs_rc4_init(void)
     int key_length;
     int x = 0, y = 0;
 	char* cipher_key;
+	uint8 aes_key[32] = {0}; /* at most 256 bits */
 	uint8* rc4_init_state = cfs_state->rc4_init_state;
 
 	cipher_key = getenv("PG_CIPHER_KEY");
@@ -241,6 +242,8 @@ static void cfs_rc4_init(void)
 	} 
 	unsetenv("PG_CIPHER_KEY"); /* make it not possible to inspect this environment variable through plperl */
     key_length = strlen(cipher_key);
+
+////// AALEKSEEV TODO GET RID OF THIS
 	for (i = 0; i < CFS_CIPHER_KEY_SIZE; ++i) {
         rc4_init_state[i] = (uint8)i;
     }
@@ -258,6 +261,15 @@ static void cfs_rc4_init(void)
         rc4_init_state[x] = rc4_init_state[y];
         rc4_init_state[y] = temp;
     }
+//////
+
+	memcpy(&aes_key, cipher_key, key_length > sizeof(aes_key) ? sizeof(aes_key) : key_length);
+	rijndael_set_key(
+		&cfs_state->aes_context, /* context */
+		(u4byte*)&aes_key,       /* key */
+		sizeof(aes_key) * 8      /* key size in bits */,
+		1                        /* for CTR mode we need only encryption */
+	);
 }
 
 /*
@@ -346,7 +358,7 @@ void cfs_initialize()
 	cfs_state->max_iterations = 0;
 	
 	if (cfs_encryption) { 
-		cfs_rc4_init();
+		cfs_crypto_init();
 	}
 	elog(LOG, "Start CFS version %s compression algorithm %s encryption %s", 
 		 CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled");
diff --git a/src/include/storage/cfs.h b/src/include/storage/cfs.h
@@ -29,8 +29,8 @@
 #define CFS_COMPRESSOR ZLIB_COMPRESSOR
 #endif
 
-#define CFS_RC4_DROP_N 3072 
-#define CFS_CIPHER_KEY_SIZE 256
+#define CFS_RC4_DROP_N 3072  // AALEKSEEV TODO GET RID OF THIS
+#define CFS_CIPHER_KEY_SIZE 256 // AALEKSEEV TODO GET RID OF THIS
 
 typedef uint64 inode_t;
 
@@ -64,6 +64,7 @@ typedef struct
 	bool           gc_enabled;
 	CfsStatistic   gc_stat;
 	uint8          rc4_init_state[CFS_CIPHER_KEY_SIZE];
+	rijndael_ctx   aes_context;
 } CfsState;
 
 typedef struct 

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ static void cfs_rc4_encrypt_block(void* block, uint32 offs, uint32 block_size)`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`227`		`-static void cfs_rc4_init(void)`
	`227`	`+static void cfs_crypto_init(void)`
`228`	`228`	`{`
`229`	`229`	`int index1 = 0;`
`230`	`230`	`int index2 = 0;`
`@@ -233,6 +233,7 @@ static void cfs_rc4_init(void)`
`233`	`233`	`int key_length;`
`234`	`234`	`int x = 0, y = 0;`
`235`	`235`	`char* cipher_key;`
	`236`	`+ uint8 aes_key[32] = {0}; /* at most 256 bits */`
`236`	`237`	`uint8* rc4_init_state = cfs_state->rc4_init_state;`
`237`	`238`
`238`	`239`	`cipher_key = getenv("PG_CIPHER_KEY");`
`@@ -241,6 +242,8 @@ static void cfs_rc4_init(void)`
`241`	`242`	`}`
`242`	`243`	`unsetenv("PG_CIPHER_KEY"); /* make it not possible to inspect this environment variable through plperl */`
`243`	`244`	`key_length = strlen(cipher_key);`
	`245`	`+`
	`246`	`+////// AALEKSEEV TODO GET RID OF THIS`
`244`	`247`	`for (i = 0; i < CFS_CIPHER_KEY_SIZE; ++i) {`
`245`	`248`	`rc4_init_state[i] = (uint8)i;`
`246`	`249`	`}`
`@@ -258,6 +261,15 @@ static void cfs_rc4_init(void)`
`258`	`261`	`rc4_init_state[x] = rc4_init_state[y];`
`259`	`262`	`rc4_init_state[y] = temp;`
`260`	`263`	`}`
	`264`	`+//////`
	`265`	`+`
	`266`	`+ memcpy(&aes_key, cipher_key, key_length > sizeof(aes_key) ? sizeof(aes_key) : key_length);`
	`267`	`+ rijndael_set_key(`
	`268`	`+ &cfs_state->aes_context, /* context */`
	`269`	`+ (u4byte)&aes_key, / key */`
	`270`	`+ sizeof(aes_key) * 8 /* key size in bits */,`
	`271`	`+ 1 /* for CTR mode we need only encryption */`
	`272`	`+ );`
`261`	`273`	`}`
`262`	`274`
`263`	`275`	`/*`
`@@ -346,7 +358,7 @@ void cfs_initialize()`
`346`	`358`	`cfs_state->max_iterations = 0;`
`347`	`359`
`348`	`360`	`if (cfs_encryption) {`
`349`		`- cfs_rc4_init();`
	`361`	`+ cfs_crypto_init();`
`350`	`362`	`}`
`351`	`363`	`elog(LOG, "Start CFS version %s compression algorithm %s encryption %s",`
`352`	`364`	`CFS_VERSION, cfs_algorithm(), cfs_encryption ? "enabled" : "disabled");`