summaryrefslogtreecommitdiff
path: root/sql/mf_iocache_encr.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-05-27 19:41:29 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-02 19:00:23 +0200
commitebc5e00641ea63d91a65921ea827f448064f9a7e (patch)
treee8d92d73e460d48e0b49e0bdb4e2de5f25b74554 /sql/mf_iocache_encr.cc
parent487e5f45908c04d63a9becf1078ecaeaf658f0ae (diff)
downloadmariadb-git-ebc5e00641ea63d91a65921ea827f448064f9a7e.tar.gz
my_aes_get_size()
return unsigned, not signed. return a value large enough for GCM
Diffstat (limited to 'sql/mf_iocache_encr.cc')
-rw-r--r--sql/mf_iocache_encr.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mf_iocache_encr.cc b/sql/mf_iocache_encr.cc
index 8d1f609a1de..d215636d62a 100644
--- a/sql/mf_iocache_encr.cc
+++ b/sql/mf_iocache_encr.cc
@@ -191,7 +191,7 @@ static int my_b_encr_write(IO_CACHE *info, const uchar *Buffer, size_t Count)
buffer_length bytes should *always* produce block_length bytes
*/
DBUG_ASSERT(crypt_data->block_length == 0 || crypt_data->block_length == wlength);
- DBUG_ASSERT(elength <= length + MY_AES_BLOCK_SIZE);
+ DBUG_ASSERT(elength <= my_aes_get_size(length));
crypt_data->block_length= wlength;
}
else