New pure gpl uptream

[roundcube.git] / debian / patches / use_mcrypt.patch

diff --git a/debian/patches/use_mcrypt.patch b/debian/patches/use_mcrypt.patch
deleted file mode 100644 (file)
index b4bb262..0000000
--- a/debian/patches/use_mcrypt.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- roundcube_0.1~beta2.2/program/include/main.inc     2006-12-22 23:26:24.000000000 +0100
-+++ roundcube_0.1~beta2.2/program/include/main.inc     2007-03-18 10:24:11.000000000 +0100
-@@ -19,7 +19,6 @@
- 
- */
- 
--require_once('lib/des.inc');
- require_once('lib/utf7.inc');
- require_once('lib/utf8.class.php');
- 
-@@ -758,7 +758,13 @@
- // encrypt IMAP password using DES encryption
- function encrypt_passwd($pass)
-   {
--  $cypher = des(get_des_key(), $pass, 1, 0, NULL);
-+  $td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, "");
-+  $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-+  mcrypt_generic_init($td, get_des_key(), $iv);
-+  $cypher = mcrypt_generic($td, $pass);
-+  mcrypt_generic_end($td);
-+  mcrypt_module_close($td);
-+  
-   return base64_encode($cypher);
-   }
- 
-@@ -766,8 +772,14 @@
- // decrypt IMAP password using DES encryption
- function decrypt_passwd($cypher)
-   {
--  $pass = des(get_des_key(), base64_decode($cypher), 0, 0, NULL);
--  return preg_replace('/\x00/', '', $pass);
-+  $td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_ECB, "");
-+  $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-+  mcrypt_generic_init($td, get_des_key(), $iv);
-+  $pass = mdecrypt_generic($td, base64_decode($cypher));
-+  mcrypt_generic_end($td);
-+  mcrypt_module_close($td);
-+
-+  return $pass;
-   }
- 
- 
---- include/main.inc~  2007-03-25 12:09:19.000000000 +0200
-+++ include/main.inc   2007-03-25 12:15:45.000000000 +0200