diff options
Diffstat (limited to 'storage/innobase/include/fil0crypt.h')
| -rw-r--r-- | storage/innobase/include/fil0crypt.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index 831d61445d8..755ebe3a0d7 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -116,10 +116,9 @@ struct fil_space_crypt_t : st_encryption_scheme min_key_version(new_min_key_version), page0_offset(0), encryption(new_encryption), - key_found(), + key_found(0), rotate_state() { - key_found = new_min_key_version; key_id = new_key_id; my_random_bytes(iv, sizeof(iv)); mutex_create(LATCH_ID_FIL_CRYPT_DATA_MUTEX, &mutex); @@ -134,6 +133,8 @@ struct fil_space_crypt_t : st_encryption_scheme type = CRYPT_SCHEME_1; min_key_version = key_get_latest_version(); } + + key_found = min_key_version; } /** Destructor */ @@ -290,16 +291,18 @@ fil_space_destroy_crypt_data( /****************************************************************** Parse a MLOG_FILE_WRITE_CRYPT_DATA log entry -@param[in] ptr Log entry start +@param[in,out] ptr Log entry start @param[in] end_ptr Log entry end @param[in] block buffer block +@param[out] err DB_SUCCESS or DB_DECRYPTION_FAILED @return position on log buffer */ UNIV_INTERN -const byte* +byte* fil_parse_write_crypt_data( - const byte* ptr, + byte* ptr, const byte* end_ptr, - const buf_block_t* block) + const buf_block_t* block, + dberr_t* err) MY_ATTRIBUTE((warn_unused_result)); /** Encrypt a buffer. @@ -484,7 +487,7 @@ encrypted, or corrupted. @param[in,out] page page frame (checksum is temporarily modified) @param[in] page_size page size -@param[in] space tablespace identifier +@param[in] space_id tablespace identifier @param[in] offset page number @return true if page is encrypted AND OK, false otherwise */ UNIV_INTERN @@ -496,7 +499,7 @@ fil_space_verify_crypt_checksum( bool strict_check, /*!< --strict-check */ FILE* log_file, /*!< --log */ #endif /* UNIV_INNOCHECKSUM */ - ulint space, + ulint space_id, ulint offset) MY_ATTRIBUTE((warn_unused_result)); |