From 867aec2fe41456f2732a9cc555e7e535eca8a7a0 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Sep 2003 22:33:43 +0400 Subject: 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 --- sql/des_key_file.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sql/des_key_file.cc') diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc index 891cf18ee53..619691d183e 100644 --- a/sql/des_key_file.cc +++ b/sql/des_key_file.cc @@ -76,16 +76,16 @@ load_des_key_file(const char *file_name) if (start != end) { - des_cblock ivec; + DES_cblock ivec; bzero((char*) &ivec,sizeof(ivec)); // We make good 24-byte (168 bit) key from given plaintext key with MD5 EVP_BytesToKey(EVP_des_ede3_cbc(),EVP_md5(),NULL, (uchar *) start, (int) (end-start),1, (uchar *) &keyblock, ivec); - des_set_key_unchecked(&keyblock.key1,des_keyschedule[(int)offset].ks1); - des_set_key_unchecked(&keyblock.key2,des_keyschedule[(int)offset].ks2); - des_set_key_unchecked(&keyblock.key3,des_keyschedule[(int)offset].ks3); + DES_set_key_unchecked(&keyblock.key1,&(des_keyschedule[(int)offset].ks1)); + DES_set_key_unchecked(&keyblock.key2,&(des_keyschedule[(int)offset].ks2)); + DES_set_key_unchecked(&keyblock.key3,&(des_keyschedule[(int)offset].ks3)); if (des_default_key == 15) des_default_key= (uint) offset; // use first as def. } -- cgit v1.2.1