1 --- roundcube_0.1~beta2.2/program/include/main.inc 2006-12-22 23:26:24.000000000 +0100
2 +++ roundcube_0.1~beta2.2/program/include/main.inc 2007-03-18 10:24:11.000000000 +0100
7 -require_once('lib/des.inc');
8 require_once('lib/utf7.inc');
9 require_once('lib/utf8.class.php');
12 // encrypt IMAP password using DES encryption
13 function encrypt_passwd($pass)
15 - $cypher = des(get_des_key(), $pass, 1, 0, NULL);
16 + $td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, "");
17 + $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
18 + mcrypt_generic_init($td, get_des_key(), $iv);
19 + $cypher = mcrypt_generic($td, $pass);
20 + mcrypt_generic_end($td);
21 + mcrypt_module_close($td);
23 return base64_encode($cypher);
27 // decrypt IMAP password using DES encryption
28 function decrypt_passwd($cypher)
30 - $pass = des(get_des_key(), base64_decode($cypher), 0, 0, NULL);
31 - return preg_replace('/\x00/', '', $pass);
32 + $td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, "");
33 + $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
34 + mcrypt_generic_init($td, get_des_key(), $iv);
35 + $pass = mdecrypt_generic($td, base64_decode($cypher));
36 + mcrypt_generic_end($td);
37 + mcrypt_module_close($td);
43 --- include/main.inc~ 2007-03-25 12:09:19.000000000 +0200
44 +++ include/main.inc 2007-03-25 12:15:45.000000000 +0200