diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/mf_iocache_encr.cc | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/mf_iocache_encr.cc')
| -rw-r--r-- | sql/mf_iocache_encr.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/mf_iocache_encr.cc b/sql/mf_iocache_encr.cc index 63830ec6..9bbcc623 100644 --- a/sql/mf_iocache_encr.cc +++ b/sql/mf_iocache_encr.cc @@ -85,7 +85,8 @@ static int my_b_encr_read(IO_CACHE *info, uchar *Buffer, size_t Count) do { - uint elength, wlength, length; + uint elength, wlength; + uint length= static_cast<uint>(info->buffer_length); uchar iv[MY_AES_BLOCK_SIZE]= {0}; DBUG_ASSERT(pos_in_file % info->buffer_length == 0); @@ -102,6 +103,7 @@ static int my_b_encr_read(IO_CACHE *info, uchar *Buffer, size_t Count) } elength= wlength - (uint)(ebuffer - wbuffer); + length= elength; set_iv(iv, pos_in_file, crypt_data->inbuf_counter); if (encryption_crypt(ebuffer, elength, info->buffer, &length, @@ -181,8 +183,9 @@ static int my_b_encr_write(IO_CACHE *info, const uchar *Buffer, size_t Count) do { + uint wlength; size_t length= MY_MIN(info->buffer_length, Count); - uint elength, wlength; + uint elength= static_cast<uint>(length); uchar iv[MY_AES_BLOCK_SIZE]= {0}; crypt_data->inbuf_counter= crypt_data->counter; @@ -272,4 +275,3 @@ int init_io_cache_encryption() _my_b_encr_write= 0; return 0; } - |