1 files changed, 11 insertions, 11 deletions

diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc
index 660cfb9417d..9f94ba8145f 100644
--- a/storage/xtradb/fil/fil0crypt.cc
+++ b/storage/xtradb/fil/fil0crypt.cc
@@ -232,7 +232,7 @@ fil_crypt_get_key(byte *dst, uint* key_length,
         }
 
         *key_length= MY_AES_MAX_KEY_LENGTH;
-	int rc = get_encryption_key(version, (unsigned char*)keybuf, key_length);
+	int rc = encryption_key_get(version, (unsigned char*)keybuf, key_length);
 	if (rc) {
 
 		ib_logf(IB_LOG_LEVEL_FATAL,
@@ -285,7 +285,7 @@ fil_crypt_get_latest_key(byte *dst, uint* key_length,
 {
 	if (srv_encrypt_tables) {
 	        // used for key rotation - get the next key id from the key provider
-		int rc = get_latest_encryption_key_version();
+		int rc = encryption_key_get_latest_version();
 
 		// if no new key was created use the last one
 		if (rc >= 0) {
@@ -313,7 +313,7 @@ fil_space_create_crypt_data()
 		crypt_data->min_key_version = 0;
 	} else {
 		crypt_data->type = CRYPT_SCHEME_1;
-		crypt_data->min_key_version = get_latest_encryption_key_version();
+		crypt_data->min_key_version = encryption_key_get_latest_version();
 	}
 
 	mutex_create(fil_crypt_data_mutex_key,
@@ -693,9 +693,9 @@ fil_space_encrypt(ulint space, ulint offset, lsn_t lsn,
 		srclen = page_size -  FIL_PAGE_DATA;
 	}
 
-	int rc = encrypt_data(src, srclen, dst, &dstlen,
-	                      (unsigned char*)key, key_length,
-	                      (unsigned char*)iv, sizeof(iv), 1, key_version);
+	int rc = encryption_encrypt(src, srclen, dst, &dstlen,
+	                            (unsigned char*)key, key_length,
+	                            (unsigned char*)iv, sizeof(iv), 1, key_version);
 
 	if (! ((rc == AES_OK) && ((ulint) dstlen == srclen))) {
 		ib_logf(IB_LOG_LEVEL_FATAL,
@@ -865,9 +865,9 @@ fil_space_decrypt(fil_space_crypt_t* crypt_data,
 		srclen = pow((double)2, (double)((int)compressed_len)) - FIL_PAGE_DATA;
 	}
 
-	int rc = decrypt_data(src, srclen, dst, &dstlen,
-	                      (unsigned char*)key, key_length,
-	                      (unsigned char*)iv, sizeof(iv), 1, key_version);
+	int rc = encryption_decrypt(src, srclen, dst, &dstlen,
+	                            (unsigned char*)key, key_length,
+	                            (unsigned char*)iv, sizeof(iv), 1, key_version);
 
 	if (! ((rc == AES_OK) && ((ulint) dstlen == srclen))) {
 		ib_logf(IB_LOG_LEVEL_FATAL,
@@ -1007,7 +1007,7 @@ fil_crypt_get_key_state(
 	key_state_t *new_state)
 {
 	if (srv_encrypt_tables == TRUE) {
-		new_state->key_version = get_latest_encryption_key_version();
+		new_state->key_version = encryption_key_get_latest_version();
 		new_state->rotate_key_age = srv_fil_crypt_rotate_key_age;
 		ut_a(new_state->key_version > 0);
 	} else {
@@ -2381,7 +2381,7 @@ fil_space_crypt_get_status(
 	}
 
 	if (srv_encrypt_tables == TRUE) {
-		status->current_key_version = get_latest_encryption_key_version();
+		status->current_key_version = encryption_key_get_latest_version();
 	} else {
 		status->current_key_version = 0;
 	}