mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with

Browse source 
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
This commit is contained in:
unknown 2003-09-12 22:33:43 +04:00
commit 867aec2fe4
4 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/des_key_file.cc
View file

@ -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.
}