diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-31 19:32:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-09 18:42:43 +0200 |
| commit | bb1b61b312088ba9f5f2cb606594b6f33c284402 (patch) | |
| tree | c5b433d19434e194fb82d2407adbbfee759dfd31 /include/mysql/plugin_encryption.h | |
| parent | 9ccafffc29526ea30151eb3e62901bfdb77aaf84 (diff) | |
| download | mariadb-git-bb1b61b312088ba9f5f2cb606594b6f33c284402.tar.gz | |
encryption plugin controls the encryption
* no --encryption-algorithm option anymore
* encrypt/decrypt methods in the encryption plugin
* ecnrypt/decrypt methods in the encryption_km service
* file_km plugin has --file-key-management-encryption-algorithm
* debug_km always uses aes_cbc
* example_km changes between aes_cbc and aes_ecb for different key versions
Diffstat (limited to 'include/mysql/plugin_encryption.h')
| -rw-r--r-- | include/mysql/plugin_encryption.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/mysql/plugin_encryption.h b/include/mysql/plugin_encryption.h index 43697096f04..a91a53c8ad5 100644 --- a/include/mysql/plugin_encryption.h +++ b/include/mysql/plugin_encryption.h @@ -1,5 +1,5 @@ #ifndef MYSQL_PLUGIN_ENCRYPTION_INCLUDED -/* Copyright (C) 2014 Sergei Golubchik and MariaDB +/* Copyright (C) 2014, 2015 Sergei Golubchik and MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,9 +29,6 @@ #define MariaDB_ENCRYPTION_INTERFACE_VERSION 0x0200 -#define BAD_ENCRYPTION_KEY_VERSION (~(unsigned int)0) -#define KEY_BUFFER_TOO_SMALL (100) - /** Encryption plugin descriptor */ @@ -68,6 +65,9 @@ struct st_mariadb_encryption */ unsigned int (*get_key)(unsigned int version, unsigned char *key, unsigned int *key_length); + + encrypt_decrypt_func encrypt; + encrypt_decrypt_func decrypt; }; #endif |