diff options
| author | monty@mysql.com <> | 2004-06-18 04:38:58 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-18 04:38:58 +0300 |
| commit | b11d25883554a7e3da972cc593a9d2a0c6094096 (patch) | |
| tree | 7b3b07f5c8491e5a81ca71b19d92dc87ec314192 /include/violite.h | |
| parent | fd0153304dc0e2ada1144fc79f117f02bdcd132b (diff) | |
| parent | f56df164f0603b268806108526d59e5d02fef82b (diff) | |
| download | mariadb-git-b11d25883554a7e3da972cc593a9d2a0c6094096.tar.gz | |
Merge with 4.0.21
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/violite.h b/include/violite.h index b4b9f724d89..ba7de3ee175 100644 --- a/include/violite.h +++ b/include/violite.h @@ -83,6 +83,14 @@ my_bool vio_poll_read(Vio *vio,uint timeout); void vio_timeout(Vio *vio,uint timeout); #ifdef HAVE_OPENSSL +#include <openssl/opensslv.h> +#if OPENSSL_VERSION_NUMBER < 0x0090700f +#define DES_cblock des_cblock +#define DES_key_schedule des_key_schedule +#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks)) +#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(l),*(k1),*(k2),*(k3),(iv),(e)) +#endif + #define HEADER_DES_LOCL_H dummy_something #include <openssl/ssl.h> #include <openssl/err.h> |