diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-04-01 21:25:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-09 18:42:44 +0200 |
| commit | 65e782607031721b22397010bd7be57bbd5f6439 (patch) | |
| tree | d27e5912eb6b67eff1b4a928e44cda9e8e4f5d25 /plugin | |
| parent | c0878f64c5c39b9cc21f66a401040a708f4f0792 (diff) | |
| download | mariadb-git-65e782607031721b22397010bd7be57bbd5f6439.tar.gz | |
renames to follow single consistent naming style
with namespace prefixes
Diffstat (limited to 'plugin')
3 files changed, 4 insertions, 4 deletions
diff --git a/plugin/debug_key_management/debug_key_management_plugin.cc b/plugin/debug_key_management/debug_key_management_plugin.cc index 5b42c70c772..a389a8ab04b 100644 --- a/plugin/debug_key_management/debug_key_management_plugin.cc +++ b/plugin/debug_key_management/debug_key_management_plugin.cc @@ -50,7 +50,7 @@ static unsigned int get_key(unsigned int version, unsigned char* dstbuf, unsigne if (*buflen < KEY_SIZE) { *buflen= KEY_SIZE; - return KEY_BUFFER_TOO_SMALL; + return ENCRYPTION_KEY_BUFFER_TOO_SMALL; } *buflen= KEY_SIZE; if (!dstbuf) diff --git a/plugin/example_key_management/example_key_management_plugin.cc b/plugin/example_key_management/example_key_management_plugin.cc index dd8416504a0..b26e42d598a 100644 --- a/plugin/example_key_management/example_key_management_plugin.cc +++ b/plugin/example_key_management/example_key_management_plugin.cc @@ -62,7 +62,7 @@ get_key(unsigned int version, unsigned char* dstbuf, unsigned *buflen) if (*buflen < MY_MD5_HASH_SIZE) { *buflen= MY_MD5_HASH_SIZE; - return KEY_BUFFER_TOO_SMALL; + return ENCRYPTION_KEY_BUFFER_TOO_SMALL; } *buflen= MY_MD5_HASH_SIZE; if (!dstbuf) diff --git a/plugin/file_key_management/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc index d7edeb73665..bf193c252b3 100644 --- a/plugin/file_key_management/file_key_management_plugin.cc +++ b/plugin/file_key_management/file_key_management_plugin.cc @@ -95,12 +95,12 @@ static unsigned int get_key_from_key_file(unsigned int key_id, keyentry* entry = get_key(key_id); if (entry == NULL) - return BAD_ENCRYPTION_KEY_VERSION; + return ENCRYPTION_KEY_VERSION_INVALID; if (*buflen < entry->length) { *buflen= entry->length; - return KEY_BUFFER_TOO_SMALL; + return ENCRYPTION_KEY_BUFFER_TOO_SMALL; } *buflen= entry->length; |