diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-07 21:41:07 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-07 21:41:07 +0300 |
| commit | 118d532134a1700bdb7ba29ce41712994f023692 (patch) | |
| tree | a56526a95032e3fe7e1c0fc41e71ad9bef89d5d8 /sql/des_key_file.cc | |
| parent | d1485aad0eb79559902b1af26502b7cc53f8e95a (diff) | |
| parent | 60e4f7d5066d549f782b975fdf695dbdab074f1b (diff) | |
| download | mariadb-git-118d532134a1700bdb7ba29ce41712994f023692.tar.gz | |
merge
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
innobase/row/row0mysql.c:
merge (no changes)
innobase/row/row0sel.c:
merge (no changes)
sql/item_subselect.cc:
Use sanjas patch instead
Diffstat (limited to 'sql/des_key_file.cc')
| -rw-r--r-- | sql/des_key_file.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/des_key_file.cc b/sql/des_key_file.cc index 5b25819b657..c6b4c5f2c34 100644 --- a/sql/des_key_file.cc +++ b/sql/des_key_file.cc @@ -79,16 +79,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. } |