mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

InnoDB/XtraDB Encryption code cleanup

Browse source 
Step 4:
-- Review fixes
-- Rename pages_page_* to pages_*
-- Remove unnecessary code
This commit is contained in:
Jan Lindström 2015-04-01 22:03:14 +03:00 • committed by Sergei Golubchik
commit af768c2f22
13 changed files with 128 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

54
storage/innobase/fil/fil0crypt.cc
View file

@ -180,20 +180,12 @@ fil_crypt_get_key(
crypt_data->keys[i] = crypt_data->keys[i - 1];
}
if (has_encryption_key(version)) {
int rc;
*key_length = get_encryption_key_size(version);
*key_length = sizeof(keybuf);
int rc = get_encryption_key(version, (unsigned char*)keybuf, *key_length);
rc = get_encryption_key(version, (unsigned char*)keybuf, *key_length);
if (rc != CRYPT_KEY_OK) {
ib_logf(IB_LOG_LEVEL_FATAL,
"Key %d can not be found. Reason=%d", version, rc);
ut_error;
}
} else {
if (rc != CRYPT_KEY_OK) {
ib_logf(IB_LOG_LEVEL_FATAL,
"Key %d not found", version);
"Key %d can not be found. Reason=%d", version, rc);
ut_error;
}
@ -207,15 +199,15 @@ fil_crypt_get_key(
/* We use AES_ECB to encryp IV */
my_aes_encrypt_dynamic_type func = get_aes_encrypt_func(MY_AES_ALGORITHM_ECB);
int rc = (*func)(src, /* Data to be encrypted = IV */
srclen, /* data length */
buf, /* Output buffer */
&buflen, /* Output buffer */
keybuf, /* Key */
*key_length, /* Key length */
NULL, /* AES_ECB does not use IV */
0, /* IV-length */
1); /* NoPadding */
rc = (*func)(src, /* Data to be encrypted = IV */
srclen, /* data length */
buf, /* Output buffer */
&buflen, /* Output buffer */
keybuf, /* Key */
*key_length, /* Key length */
NULL, /* AES_ECB does not use IV */
0, /* IV-length */
1); /* NoPadding */
if (rc != AES_OK) {
ib_logf(IB_LOG_LEVEL_FATAL,
@ -250,14 +242,12 @@ fil_crypt_get_latest_key(
fil_space_crypt_t* crypt_data, /*!< in: crypt data */
uint* version) /*!< in: Key version */
{
if (srv_encrypt_tables) {
// used for key rotation - get the next key id from the key provider
int rc = get_latest_encryption_key_version();
// used for key rotation - get the next key id from the key provider
int rc = get_latest_encryption_key_version();
// if no new key was created use the last one
if (rc >= 0) {
*version = rc;
}
// if no new key was created use the last one
if (rc >= 0) {
*version = rc;
}
return fil_crypt_get_key(dst, key_length, crypt_data, *version);
@ -423,10 +413,6 @@ fil_space_destroy_crypt_data(
fil_space_crypt_t **crypt_data) /*!< out: crypt data */
{
if (crypt_data != NULL && (*crypt_data) != NULL) {
/* lock (and unlock) mutex to make sure no one has it locked
* currently */
mutex_enter(& (*crypt_data)->mutex);
mutex_exit(& (*crypt_data)->mutex);
mutex_free(& (*crypt_data)->mutex);
free(*crypt_data);
(*crypt_data) = NULL;
@ -755,6 +741,8 @@ fil_space_encrypt(
/* Store compression algorithm (for page compresed tables) or 0 */
mach_write_to_2(dst_frame + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION + 6,
compression_algo);
srv_stats.pages_encrypted.inc();
}
/*********************************************************************
@ -934,6 +922,8 @@ fil_space_decrypt(
compression_algo);
}
srv_stats.pages_decrypted.inc();
return true; /* page was decrypted */
}