diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-04 13:57:26 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-08 09:41:09 +0300 |
| commit | 34eef269eb93ee42c0e5e1894781c61f66cb6f14 (patch) | |
| tree | 311a6e0201c46acb99456dfafbc6ffdfa1b3a656 /extra/CMakeLists.txt | |
| parent | 36e81a23c567f81d08b6434087cf284e1bee06f9 (diff) | |
| download | mariadb-git-34eef269eb93ee42c0e5e1894781c61f66cb6f14.tar.gz | |
MDEV-11939: innochecksum mistakes a file for an encrypted one (page 0 invalid)
Always read full page 0 to determine does tablespace contain
encryption metadata. Tablespaces that are page compressed or
page compressed and encrypted do not compare checksum as
it does not exists. For encrypted tables use checksum
verification written for encrypted tables and normal tables
use normal method.
buf_page_is_checksum_valid_crc32
buf_page_is_checksum_valid_innodb
buf_page_is_checksum_valid_none
Modify Innochecksum logging to file to avoid compilation
warnings.
fil0crypt.cc fil0crypt.h
Modify to be able to use in innochecksum compilation and
move fil_space_verify_crypt_checksum to end of the file.
Add innochecksum logging to file.
univ.i
Add innochecksum strict_verify, log_file and cur_page_num
variables as extern.
page_zip_verify_checksum
Add innochecksum logging to file and remove unnecessary code.
innochecksum.cc
Lot of changes most notable able to read encryption
metadata from page 0 of the tablespace.
Added test case where we corrupt intentionally
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION (encryption key version)
FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION+4 (post encryption checksum)
FIL_DATA+10 (data)
Diffstat (limited to 'extra/CMakeLists.txt')
| -rw-r--r-- | extra/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 9cc5e7faa86..8c73e23d72b 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -79,7 +79,6 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_XTRADB_STORAGE_ENGINE) ../storage/innobase/ut/ut0ut.cc ../storage/innobase/buf/buf0buf.cc ../storage/innobase/page/page0zip.cc - ../storage/innobase/os/os0file.cc ../storage/innobase/fil/fil0crypt.cc ) |