diff options
| author | unknown <dlenev@mysql.com> | 2003-09-12 22:33:43 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2003-09-12 22:33:43 +0400 |
| commit | 867aec2fe41456f2732a9cc555e7e535eca8a7a0 (patch) | |
| tree | 1d852e8ef118cc78b1b79f1d6afc97e881c0647e /include | |
| parent | cdbc2fe43a0d9d19bdaec304d841fe45e3e91551 (diff) | |
| download | mariadb-git-867aec2fe41456f2732a9cc555e7e535eca8a7a0.tar.gz | |
Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with
their newer DES_ versions.
Provided macros for backward compatibility.
include/my_global.h:
Added macros for DES_ OpenSSL functions for compatibility with pre 0.9.7
sql/des_key_file.cc:
Replaced deprecated OpenSSL des_ calls and types with newer
sql/item_strfunc.cc:
Replaced deprecated OpenSSL des_ calls and types with newer
sql/mysql_priv.h:
Replaced deprecated OpenSSL des_ types with newer
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9d08977a7cd..59e0c43f18d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1105,4 +1105,14 @@ typedef union { #define statistic_add(V,C,L) (V)+=(C) #endif +#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 +#endif + #endif /* my_global_h */ |