From 85803ddf86b7e86708f8d4b7c1c3494351bbdb3d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Jun 2004 20:02:08 +0400 Subject: Fixed issue with compilation MySQL with OpenSSL if OpenSSL is installed in non-statndart directory ('openssl/opensslv.h: No such file or directory') include/my_global.h: Fixed issue with compilation MySQL with OpenSSL if OpenSSL is installed in non-statndart directory include/violite.h: Fixed issue with compilation MySQL with OpenSSL if OpenSSL is installed in non-statndart directory --- include/violite.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include/violite.h') diff --git a/include/violite.h b/include/violite.h index 18f862d4b77..8464a6b8654 100644 --- a/include/violite.h +++ b/include/violite.h @@ -78,6 +78,14 @@ my_bool vio_poll_read(Vio *vio,uint timeout); void vio_timeout(Vio *vio,uint timeout); #ifdef HAVE_OPENSSL +#include +#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),( +#endif + #define HEADER_DES_LOCL_H dummy_something #include #include -- cgit v1.2.1 From 82472a06f3734c359a5876995443873b71daa2e4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 17 Jun 2004 15:01:54 +0400 Subject: Fixed issue 'the definition of macro DES_ede3_cbc_encrypt is corrupt' --- include/violite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/violite.h') diff --git a/include/violite.h b/include/violite.h index 8464a6b8654..6c4a42b1a53 100644 --- a/include/violite.h +++ b/include/violite.h @@ -83,7 +83,7 @@ void vio_timeout(Vio *vio,uint timeout); #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),( +#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 -- cgit v1.2.1