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 /sql/item_strfunc.h | |
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 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index e7d509206f2..d1abbe198b1 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -148,10 +148,7 @@ class Item_aes_crypt :public Item_str_func void create_key(String *user_key, uchar* key); protected: - int (*crypt)(const uchar* src, uint slen, uchar* dst, uint* dlen, - const uchar* key, uint klen, const uchar* iv, uint ivlen, - int no_padding); - + int what; public: Item_aes_crypt(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {} String *val_str(String *); |