diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-13 21:57:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-15 18:12:01 +0200 |
| commit | 2300fe2e0ed59e36046bb867cc7499bf4c3d7c27 (patch) | |
| tree | 9adab44a30ef40e5cf1e1661220a9cf8079cb5b5 /include/my_crypt.h | |
| parent | 632f2307f775d255bab948de2178feb85fcac970 (diff) | |
| download | mariadb-git-2300fe2e0ed59e36046bb867cc7499bf4c3d7c27.tar.gz | |
Identical key derivation code in XtraDB/InnoDB/Aria
* Extract it into the "encryption_scheme" service.
* Make these engines to use the service, remove duplicate code.
* Change MY_AES_xxx error codes, to return them safely
from encryption_scheme_encrypt/decrypt without conflicting
with ENCRYPTION_SCHEME_KEY_INVALID error
Diffstat (limited to 'include/my_crypt.h')
| -rw-r--r-- | include/my_crypt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_crypt.h b/include/my_crypt.h index bfde4d3c0f7..655d1641136 100644 --- a/include/my_crypt.h +++ b/include/my_crypt.h @@ -25,10 +25,10 @@ extern "C" { #endif /* return values from my_aes_encrypt/my_aes_decrypt functions */ -#define MY_AES_OK 0 -#define MY_AES_BAD_DATA -1 -#define MY_AES_OPENSSL_ERROR -2 -#define MY_AES_BAD_KEYSIZE -3 +#define MY_AES_OK 0 +#define MY_AES_BAD_DATA -100 +#define MY_AES_OPENSSL_ERROR -101 +#define MY_AES_BAD_KEYSIZE -102 /* The block size for all supported algorithms */ #define MY_AES_BLOCK_SIZE 16 |