diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:32:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:50 +0200 |
| commit | 66b9a9409c73e298d6ceb668783a7cdd5ee85a69 (patch) | |
| tree | be04b2c42d1b858756c5a8ba5355abd961589ec8 /mysys/mf_iocache.c | |
| parent | d94a982adbc21d74c0202f1ef64119baeb27c597 (diff) | |
| download | mariadb-git-66b9a9409c73e298d6ceb668783a7cdd5ee85a69.tar.gz | |
New encryption API. Piece-wise encryption.
Instead of encrypt(src, dst, key, iv) that encrypts all
data in one go, now we have encrypt_init(key,iv),
encrypt_update(src,dst), and encrypt_finish(dst).
This also causes collateral changes in the internal my_crypt.cc
encryption functions and in the encryption service.
There are wrappers to provide the old all-at-once encryption
functionality. But binlog events are often written piecewise,
they'll need the new api.
Diffstat (limited to 'mysys/mf_iocache.c')
| -rw-r--r-- | mysys/mf_iocache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 4591557baf0..28e5e72130d 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -265,7 +265,7 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize, if (type == SEQ_READ_APPEND) buffer_block *= 2; else if (cache_myflags & MY_ENCRYPT) - buffer_block= 2*my_aes_get_size(buffer_block) + sizeof(IO_CACHE_CRYPT); + buffer_block= 2*(buffer_block + MY_AES_BLOCK_SIZE) + sizeof(IO_CACHE_CRYPT); if (cachesize == min_cache) flags|= (myf) MY_WME; |