diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-24 20:43:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-05 13:14:37 +0200 |
| commit | 2f8d101f9eb5193a8a1d5ab5cc8e52d7b52007a4 (patch) | |
| tree | 5dbab28b47eb9055efeec9a3b2c3cb9fb6bc711e /storage | |
| parent | 27cc252bb73436957120a964734a794ab3fd64ef (diff) | |
| download | mariadb-git-2f8d101f9eb5193a8a1d5ab5cc8e52d7b52007a4.tar.gz | |
unify my_{en|de}crypt_{cbc|ecb|ctr}. no yassl support yet.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0crypt.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 9f8315a8016..f4602fa7fdc 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -212,6 +212,7 @@ fil_crypt_get_key(byte *dst, uint* key_length, mutex_enter(&crypt_data->mutex); if (!page_encrypted) { + *key_length = get_encryption_key_size(version); // Check if we already have key for (uint i = 0; i < crypt_data->key_count; i++) { if (crypt_data->keys[i].key_version == version) { diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index 9f8315a8016..f4602fa7fdc 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -212,6 +212,7 @@ fil_crypt_get_key(byte *dst, uint* key_length, mutex_enter(&crypt_data->mutex); if (!page_encrypted) { + *key_length = get_encryption_key_size(version); // Check if we already have key for (uint i = 0; i < crypt_data->key_count; i++) { if (crypt_data->keys[i].key_version == version) { |