diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-25 09:47:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-05 13:14:38 +0200 |
| commit | 3bbe2057da977b3197e19ceede87b4e79b542b59 (patch) | |
| tree | fae50622ea44dd2357235227fcdbc3e7abf512a0 /include/my_crypt.h | |
| parent | 2f8d101f9eb5193a8a1d5ab5cc8e52d7b52007a4 (diff) | |
| download | mariadb-git-3bbe2057da977b3197e19ceede87b4e79b542b59.tar.gz | |
yassl support
Diffstat (limited to 'include/my_crypt.h')
| -rw-r--r-- | include/my_crypt.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/my_crypt.h b/include/my_crypt.h index db25b1f37af..83665659178 100644 --- a/include/my_crypt.h +++ b/include/my_crypt.h @@ -17,14 +17,15 @@ // TODO: Add Windows support -#ifndef MYSYS_MY_CRYPT_H_ -#define MYSYS_MY_CRYPT_H_ +#ifndef MY_CRYPT_INCLUDED +#define MY_CRYPT_INCLUDED #include <my_aes.h> -#if !defined(HAVE_YASSL) && defined(HAVE_OPENSSL) - C_MODE_START + +#ifdef HAVE_EncryptAes128Ctr + Crypt_result my_aes_encrypt_ctr(const uchar* source, uint32 source_length, uchar* dest, uint32* dest_length, const unsigned char* key, uint8 key_length, @@ -37,6 +38,8 @@ Crypt_result my_aes_decrypt_ctr(const uchar* source, uint32 source_length, const unsigned char* iv, uint8 iv_length, uint no_padding); +#endif + Crypt_result my_aes_encrypt_cbc(const uchar* source, uint32 source_length, uchar* dest, uint32* dest_length, const unsigned char* key, uint8 key_length, @@ -60,12 +63,9 @@ Crypt_result my_aes_decrypt_ecb(const uchar* source, uint32 source_length, const unsigned char* key, uint8 key_length, const unsigned char* iv, uint8 iv_length, uint no_padding); -C_MODE_END - -#endif /* !defined(HAVE_YASSL) && defined(HAVE_OPENSSL) */ -C_MODE_START Crypt_result my_random_bytes(uchar* buf, int num); + C_MODE_END -#endif /* MYSYS_MY_CRYPT_H_ */ +#endif /* MY_CRYPT_INCLUDED */ |