diff --git a/CHANGELOG b/CHANGELOG index aa393011f..aba612cf9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Require Mbstring and OpenSSL extensions (#1490415) - Get rid of Mail_mimeDecode package dependency (#1490416) - Add --config and --type options to moduserprefs.sh script (#1490051) - Implemented memcache_debug and apc_debug options diff --git a/INSTALL b/INSTALL index ed6dc96cd..a894370aa 100644 --- a/INSTALL +++ b/INSTALL @@ -12,10 +12,9 @@ REQUIREMENTS * The Apache, Lighttpd, Cherokee or Hiawatha web server * .htaccess support allowing overrides for DirectoryIndex * PHP Version 5.3.7 or greater including - - PCRE, DOM, JSON, Session, Sockets (required) + - PCRE, DOM, JSON, Session, Sockets, OpenSSL, Mbstring (required) - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required) - - Libiconv, Zip (recommended) - - OpenSSL, Fileinfo, Mcrypt, mbstring (optional) + - Libiconv, Zip, Fileinfo (recommended) * PEAR packages distributed with Roundcube or external: - Mail_Mime 1.8.1 or newer - Net_SMTP (latest from https://github.com/pear/Net_SMTP/) diff --git a/composer.json-dist b/composer.json-dist index 06029e5c3..235a3ee10 100644 --- a/composer.json-dist +++ b/composer.json-dist @@ -23,8 +23,7 @@ "pear-pear.php.net/net_idna2": ">=0.1.1", "pear-pear.php.net/net_sieve": ">=1.3.2", "pear/mail_mime": ">=1.8.9", - "pear/net_smtp": "dev-master", - "patchwork/utf8": "1.2.x" + "pear/net_smtp": "dev-master" }, "require-dev": { "pear-pear.php.net/crypt_gpg": "*", diff --git a/installer/check.php b/installer/check.php index 219e5c1c1..674277471 100644 --- a/installer/check.php +++ b/installer/check.php @@ -15,14 +15,13 @@ $required_php_exts = array( 'XML' => 'xml', 'JSON' => 'json', 'PDO' => 'PDO', + 'Multibyte' => 'mbstring', + 'OpenSSL' => 'openssl', ); $optional_php_exts = array( 'FileInfo' => 'fileinfo', 'Libiconv' => 'iconv', - 'Multibyte' => 'mbstring', - 'OpenSSL' => 'openssl', - 'Mcrypt' => 'mcrypt', 'Intl' => 'intl', 'Exif' => 'exif', 'LDAP' => 'ldap', @@ -63,7 +62,6 @@ $source_urls = array( 'FileInfo' => 'http://www.php.net/manual/en/book.fileinfo.php', 'Libiconv' => 'http://www.php.net/manual/en/book.iconv.php', 'Multibyte' => 'http://www.php.net/manual/en/book.mbstring.php', - 'Mcrypt' => 'http://www.php.net/manual/en/book.mcrypt.php', 'OpenSSL' => 'http://www.php.net/manual/en/book.openssl.php', 'JSON' => 'http://www.php.net/manual/en/book.json.php', 'DOM' => 'http://www.php.net/manual/en/book.dom.php', diff --git a/program/include/iniset.php b/program/include/iniset.php index f68c31ef9..3044e0e0a 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -68,15 +68,6 @@ spl_autoload_register('rcmail_autoload'); // backward compatybility (to be removed) require_once INSTALL_PATH . 'program/include/bc.php'; -// load the UTF-8 portability layers from Patchwork -// don't load mbstring layer as it conflicts with Roundcube Framework (#1490280) -if (!function_exists('iconv')) { - \Patchwork\Utf8\Bootup::initIconv(); -} -if (!function_exists('utf8_encode')) { - \Patchwork\Utf8\Bootup::initUtf8Encode(); -} - /** * PHP5 autoloader routine for dynamic class loading */ diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 69dbb9b3e..2b7682b65 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -355,42 +355,6 @@ function version_parse($version) $version); } -/** - * mbstring replacement functions - */ -if (!extension_loaded('mbstring')) -{ - function mb_strlen($str) - { - return strlen($str); - } - - function mb_strtolower($str) - { - return strtolower($str); - } - - function mb_strtoupper($str) - { - return strtoupper($str); - } - - function mb_substr($str, $start, $len=null) - { - return substr($str, $start, $len); - } - - function mb_strpos($haystack, $needle, $offset=0) - { - return strpos($haystack, $needle, $offset); - } - - function mb_strrpos($haystack, $needle, $offset=0) - { - return strrpos($haystack, $needle, $offset); - } -} - /** * intl replacement functions */ diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 02e11e2bb..8f75f8c7e 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -827,40 +827,12 @@ class rcube // Add a single canary byte to the end of the clear text, which // will help find out how much of padding will need to be removed // upon decryption; see http://php.net/mcrypt_generic#68082. - $clear = pack("a*H2", $clear, "80"); - $ckey = $this->config->get_crypto_key($key); - - if (function_exists('openssl_encrypt')) { - $method = 'DES-EDE3-CBC'; - $opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true; - $iv = $this->create_iv(openssl_cipher_iv_length($method)); - $cipher = $iv . openssl_encrypt($clear, $method, $ckey, $opts, $iv); - } - else if (function_exists('mcrypt_module_open') && - ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, "")) - ) { - $iv = $this->create_iv(mcrypt_enc_get_iv_size($td)); - mcrypt_generic_init($td, $ckey, $iv); - $cipher = $iv . mcrypt_generic($td, $clear); - mcrypt_generic_deinit($td); - mcrypt_module_close($td); - } - else { - @include_once 'des.inc'; - - if (function_exists('des')) { - $des_iv_size = 8; - $iv = $this->create_iv($des_iv_size); - $cipher = $iv . des($ckey, $clear, 1, 1, $iv); - } - else { - self::raise_error(array( - 'code' => 500, 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Could not perform encryption; make sure OpenSSL or Mcrypt or lib/des.inc is available" - ), true, true); - } - } + $clear = pack("a*H2", $clear, "80"); + $ckey = $this->config->get_crypto_key($key); + $method = 'DES-EDE3-CBC'; + $opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true; + $iv = rcube_utils::random_bytes(openssl_cipher_iv_length($method), true); + $cipher = $iv . openssl_encrypt($clear, $method, $ckey, $opts, $iv); return $base64 ? base64_encode($cipher) : $cipher; } @@ -883,54 +855,18 @@ class rcube $cipher = $base64 ? base64_decode($cipher) : $cipher; $ckey = $this->config->get_crypto_key($key); - if (function_exists('openssl_decrypt')) { - $method = 'DES-EDE3-CBC'; - $opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true; - $iv_size = openssl_cipher_iv_length($method); - $iv = substr($cipher, 0, $iv_size); - - // session corruption? (#1485970) - if (strlen($iv) < $iv_size) { - return ''; - } + $method = 'DES-EDE3-CBC'; + $opts = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true; + $iv_size = openssl_cipher_iv_length($method); + $iv = substr($cipher, 0, $iv_size); - $cipher = substr($cipher, $iv_size); - $clear = openssl_decrypt($cipher, $method, $ckey, $opts, $iv); - } - else if (function_exists('mcrypt_module_open') && - ($td = mcrypt_module_open(MCRYPT_TripleDES, "", MCRYPT_MODE_CBC, "")) - ) { - $iv_size = mcrypt_enc_get_iv_size($td); - $iv = substr($cipher, 0, $iv_size); - - // session corruption? (#1485970) - if (strlen($iv) < $iv_size) { - return ''; - } - - $cipher = substr($cipher, $iv_size); - mcrypt_generic_init($td, $ckey, $iv); - $clear = mdecrypt_generic($td, $cipher); - mcrypt_generic_deinit($td); - mcrypt_module_close($td); + // session corruption? (#1485970) + if (strlen($iv) < $iv_size) { + return ''; } - else { - @include_once 'des.inc'; - if (function_exists('des')) { - $des_iv_size = 8; - $iv = substr($cipher, 0, $des_iv_size); - $cipher = substr($cipher, $des_iv_size); - $clear = des($ckey, $cipher, 0, 1, $iv); - } - else { - self::raise_error(array( - 'code' => 500, 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Could not perform decryption; make sure OpenSSL or Mcrypt or lib/des.inc is available" - ), true, true); - } - } + $cipher = substr($cipher, $iv_size); + $clear = openssl_decrypt($cipher, $method, $ckey, $opts, $iv); // Trim PHP's padding and the canary byte; see note in // rcube::encrypt() and http://php.net/mcrypt_generic#68082 @@ -939,25 +875,6 @@ class rcube return $clear; } - /** - * Generates encryption initialization vector (IV) - * - * @param int $size Vector size - * - * @return string Vector string - */ - private function create_iv($size) - { - // mcrypt_create_iv() can be slow when system lacks entrophy - // we'll generate IV vector manually - $iv = ''; - for ($i = 0; $i < $size; $i++) { - $iv .= chr(mt_rand(0, 255)); - } - - return $iv; - } - /** * Returns session token for secure URLs * diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 7001e121a..3e26e8661 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -567,7 +567,7 @@ class rcube_mime // Note: Never try to use iconv instead of mbstring functions here // Iconv's substr/strlen are 100x slower (#1489113) - if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) { + if ($charset && $charset != RCUBE_CHARSET) { mb_internal_encoding($charset); } @@ -661,7 +661,7 @@ class rcube_mime } } - if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) { + if ($charset && $charset != RCUBE_CHARSET) { mb_internal_encoding(RCUBE_CHARSET); } diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php index 23fc3f823..db6c24cbe 100644 --- a/program/lib/Roundcube/rcube_utils.php +++ b/program/lib/Roundcube/rcube_utils.php @@ -1123,28 +1123,25 @@ class rcube_utils /** * Generate a ramdom string * - * @param int String length + * @param int $length String length + * @param bool $raw Return RAW data instead of hex * * @return string The generated random string */ - public static function random_bytes($length) + public static function random_bytes($length, $raw = false) { - if (function_exists('openssl_random_pseudo_bytes')) { - $random = openssl_random_pseudo_bytes(ceil($length / 2)); - $random = bin2hex($random); + $rlen = $raw ? $length : ceil($length / 2); + $random = openssl_random_pseudo_bytes($rlen); - // if the length wasn't even... - if ($length < strlen($random)) { - $random = substr($random, 0, $length); - } + if ($raw) { + return $random; } - else { - $alpha = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789+*%&?!$-_='; - $random = ''; - for ($i = 0; $i < $length; $i++) { - $random .= $alpha[rand(0, strlen($alpha)-1)]; - } + $random = bin2hex($random); + + // if the length wasn't even... + if ($length < strlen($random)) { + $random = substr($random, 0, $length); } return $random; diff --git a/program/lib/des.inc b/program/lib/des.inc deleted file mode 100644 index 00ecd688f..000000000 --- a/program/lib/des.inc +++ /dev/null @@ -1,218 +0,0 @@ -> 4 & $masks[4]) ^ $right) & 0x0f0f0f0f; $right ^= $temp; $left ^= ($temp << 4); - $temp = (($left >> 16 & $masks[16]) ^ $right) & 0x0000ffff; $right ^= $temp; $left ^= ($temp << 16); - $temp = (($right >> 2 & $masks[2]) ^ $left) & 0x33333333; $left ^= $temp; $right ^= ($temp << 2); - $temp = (($right >> 8 & $masks[8]) ^ $left) & 0x00ff00ff; $left ^= $temp; $right ^= ($temp << 8); - $temp = (($left >> 1 & $masks[1]) ^ $right) & 0x55555555; $right ^= $temp; $left ^= ($temp << 1); - - $left = (($left << 1) | ($left >> 31 & $masks[31])); - $right = (($right << 1) | ($right >> 31 & $masks[31])); - - //do this either 1 or 3 times for each chunk of the message - for ($j=0; $j<$iterations; $j+=3) { - $endloop = $looping[$j+1]; - $loopinc = $looping[$j+2]; - //now go through and perform the encryption or decryption - for ($i=$looping[$j]; $i!=$endloop; $i+=$loopinc) { //for efficiency - $right1 = $right ^ $keys[$i]; - $right2 = (($right >> 4 & $masks[4]) | ($right << 28)) ^ $keys[$i+1]; - //the result is attained by passing these bytes through the S selection functions - $temp = $left; - $left = $right; - $right = $temp ^ ($spfunction2[($right1 >> 24 & $masks[24]) & 0x3f] | $spfunction4[($right1 >> 16 & $masks[16]) & 0x3f] - | $spfunction6[($right1 >> 8 & $masks[8]) & 0x3f] | $spfunction8[$right1 & 0x3f] - | $spfunction1[($right2 >> 24 & $masks[24]) & 0x3f] | $spfunction3[($right2 >> 16 & $masks[16]) & 0x3f] - | $spfunction5[($right2 >> 8 & $masks[8]) & 0x3f] | $spfunction7[$right2 & 0x3f]); - } - $temp = $left; $left = $right; $right = $temp; //unreverse left and right - } //for either 1 or 3 iterations - - //move then each one bit to the right - $left = (($left >> 1 & $masks[1]) | ($left << 31)); - $right = (($right >> 1 & $masks[1]) | ($right << 31)); - - //now perform IP-1, which is IP in the opposite direction - $temp = (($left >> 1 & $masks[1]) ^ $right) & 0x55555555; $right ^= $temp; $left ^= ($temp << 1); - $temp = (($right >> 8 & $masks[8]) ^ $left) & 0x00ff00ff; $left ^= $temp; $right ^= ($temp << 8); - $temp = (($right >> 2 & $masks[2]) ^ $left) & 0x33333333; $left ^= $temp; $right ^= ($temp << 2); - $temp = (($left >> 16 & $masks[16]) ^ $right) & 0x0000ffff; $right ^= $temp; $left ^= ($temp << 16); - $temp = (($left >> 4 & $masks[4]) ^ $right) & 0x0f0f0f0f; $right ^= $temp; $left ^= ($temp << 4); - - //for Cipher Block Chaining mode, xor the message with the previous result - if ($mode == 1) {if ($encrypt) {$cbcleft = $left; $cbcright = $right;} else {$left ^= $cbcleft2; $right ^= $cbcright2;}} - $tempresult .= (chr($left>>24 & $masks[24]) . chr(($left>>16 & $masks[16]) & 0xff) . chr(($left>>8 & $masks[8]) & 0xff) . chr($left & 0xff) . chr($right>>24 & $masks[24]) . chr(($right>>16 & $masks[16]) & 0xff) . chr(($right>>8 & $masks[8]) & 0xff) . chr($right & 0xff)); - - $chunk += 8; - if ($chunk == 512) {$result .= $tempresult; $tempresult = ""; $chunk = 0;} - } //for every 8 characters, or 64 bits in the message - - //return the result as an array - return ($result . $tempresult); -} //end of des - -//des_createKeys -//this takes as input a 64 bit key (even though only 56 bits are used) -//as an array of 2 integers, and returns 16 48 bit keys -function des_createKeys ($key) { - //declaring this locally speeds things up a bit - $pc2bytes0 = array (0,0x4,0x20000000,0x20000004,0x10000,0x10004,0x20010000,0x20010004,0x200,0x204,0x20000200,0x20000204,0x10200,0x10204,0x20010200,0x20010204); - $pc2bytes1 = array (0,0x1,0x100000,0x100001,0x4000000,0x4000001,0x4100000,0x4100001,0x100,0x101,0x100100,0x100101,0x4000100,0x4000101,0x4100100,0x4100101); - $pc2bytes2 = array (0,0x8,0x800,0x808,0x1000000,0x1000008,0x1000800,0x1000808,0,0x8,0x800,0x808,0x1000000,0x1000008,0x1000800,0x1000808); - $pc2bytes3 = array (0,0x200000,0x8000000,0x8200000,0x2000,0x202000,0x8002000,0x8202000,0x20000,0x220000,0x8020000,0x8220000,0x22000,0x222000,0x8022000,0x8222000); - $pc2bytes4 = array (0,0x40000,0x10,0x40010,0,0x40000,0x10,0x40010,0x1000,0x41000,0x1010,0x41010,0x1000,0x41000,0x1010,0x41010); - $pc2bytes5 = array (0,0x400,0x20,0x420,0,0x400,0x20,0x420,0x2000000,0x2000400,0x2000020,0x2000420,0x2000000,0x2000400,0x2000020,0x2000420); - $pc2bytes6 = array (0,0x10000000,0x80000,0x10080000,0x2,0x10000002,0x80002,0x10080002,0,0x10000000,0x80000,0x10080000,0x2,0x10000002,0x80002,0x10080002); - $pc2bytes7 = array (0,0x10000,0x800,0x10800,0x20000000,0x20010000,0x20000800,0x20010800,0x20000,0x30000,0x20800,0x30800,0x20020000,0x20030000,0x20020800,0x20030800); - $pc2bytes8 = array (0,0x40000,0,0x40000,0x2,0x40002,0x2,0x40002,0x2000000,0x2040000,0x2000000,0x2040000,0x2000002,0x2040002,0x2000002,0x2040002); - $pc2bytes9 = array (0,0x10000000,0x8,0x10000008,0,0x10000000,0x8,0x10000008,0x400,0x10000400,0x408,0x10000408,0x400,0x10000400,0x408,0x10000408); - $pc2bytes10 = array (0,0x20,0,0x20,0x100000,0x100020,0x100000,0x100020,0x2000,0x2020,0x2000,0x2020,0x102000,0x102020,0x102000,0x102020); - $pc2bytes11 = array (0,0x1000000,0x200,0x1000200,0x200000,0x1200000,0x200200,0x1200200,0x4000000,0x5000000,0x4000200,0x5000200,0x4200000,0x5200000,0x4200200,0x5200200); - $pc2bytes12 = array (0,0x1000,0x8000000,0x8001000,0x80000,0x81000,0x8080000,0x8081000,0x10,0x1010,0x8000010,0x8001010,0x80010,0x81010,0x8080010,0x8081010); - $pc2bytes13 = array (0,0x4,0x100,0x104,0,0x4,0x100,0x104,0x1,0x5,0x101,0x105,0x1,0x5,0x101,0x105); - $masks = array (4294967295,2147483647,1073741823,536870911,268435455,134217727,67108863,33554431,16777215,8388607,4194303,2097151,1048575,524287,262143,131071,65535,32767,16383,8191,4095,2047,1023,511,255,127,63,31,15,7,3,1,0); - - //how many iterations (1 for des, 3 for triple des) - $iterations = ((strlen($key) >= 24) ? 3 : 1); - //stores the return keys - $keys = array (); // size = 32 * iterations but you don't specify this in php - //now define the left shifts which need to be done - $shifts = array (0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0); - //other variables - $m=0; - $n=0; - - for ($j=0; $j<$iterations; $j++) { //either 1 or 3 iterations - $left = (ord($key{$m++}) << 24) | (ord($key{$m++}) << 16) | (ord($key{$m++}) << 8) | ord($key{$m++}); - $right = (ord($key{$m++}) << 24) | (ord($key{$m++}) << 16) | (ord($key{$m++}) << 8) | ord($key{$m++}); - - $temp = (($left >> 4 & $masks[4]) ^ $right) & 0x0f0f0f0f; $right ^= $temp; $left ^= ($temp << 4); - $temp = (($right >> 16 & $masks[16]) ^ $left) & 0x0000ffff; $left ^= $temp; $right ^= ($temp << -16); - $temp = (($left >> 2 & $masks[2]) ^ $right) & 0x33333333; $right ^= $temp; $left ^= ($temp << 2); - $temp = (($right >> 16 & $masks[16]) ^ $left) & 0x0000ffff; $left ^= $temp; $right ^= ($temp << -16); - $temp = (($left >> 1 & $masks[1]) ^ $right) & 0x55555555; $right ^= $temp; $left ^= ($temp << 1); - $temp = (($right >> 8 & $masks[8]) ^ $left) & 0x00ff00ff; $left ^= $temp; $right ^= ($temp << 8); - $temp = (($left >> 1 & $masks[1]) ^ $right) & 0x55555555; $right ^= $temp; $left ^= ($temp << 1); - - //the right side needs to be shifted and to get the last four bits of the left side - $temp = ($left << 8) | (($right >> 20 & $masks[20]) & 0x000000f0); - //left needs to be put upside down - $left = ($right << 24) | (($right << 8) & 0xff0000) | (($right >> 8 & $masks[8]) & 0xff00) | (($right >> 24 & $masks[24]) & 0xf0); - $right = $temp; - - //now go through and perform these shifts on the left and right keys - for ($i=0; $i < count($shifts); $i++) { - //shift the keys either one or two bits to the left - if ($shifts[$i] > 0) { - $left = (($left << 2) | ($left >> 26 & $masks[26])); - $right = (($right << 2) | ($right >> 26 & $masks[26])); - } else { - $left = (($left << 1) | ($left >> 27 & $masks[27])); - $right = (($right << 1) | ($right >> 27 & $masks[27])); - } - $left = $left & -0xf; - $right = $right & -0xf; - - //now apply PC-2, in such a way that E is easier when encrypting or decrypting - //this conversion will look like PC-2 except only the last 6 bits of each byte are used - //rather than 48 consecutive bits and the order of lines will be according to - //how the S selection functions will be applied: S2, S4, S6, S8, S1, S3, S5, S7 - $lefttemp = $pc2bytes0[$left >> 28 & $masks[28]] | $pc2bytes1[($left >> 24 & $masks[24]) & 0xf] - | $pc2bytes2[($left >> 20 & $masks[20]) & 0xf] | $pc2bytes3[($left >> 16 & $masks[16]) & 0xf] - | $pc2bytes4[($left >> 12 & $masks[12]) & 0xf] | $pc2bytes5[($left >> 8 & $masks[8]) & 0xf] - | $pc2bytes6[($left >> 4 & $masks[4]) & 0xf]; - $righttemp = $pc2bytes7[$right >> 28 & $masks[28]] | $pc2bytes8[($right >> 24 & $masks[24]) & 0xf] - | $pc2bytes9[($right >> 20 & $masks[20]) & 0xf] | $pc2bytes10[($right >> 16 & $masks[16]) & 0xf] - | $pc2bytes11[($right >> 12 & $masks[12]) & 0xf] | $pc2bytes12[($right >> 8 & $masks[8]) & 0xf] - | $pc2bytes13[($right >> 4 & $masks[4]) & 0xf]; - $temp = (($righttemp >> 16 & $masks[16]) ^ $lefttemp) & 0x0000ffff; - $keys[$n++] = $lefttemp ^ $temp; $keys[$n++] = $righttemp ^ ($temp << 16); - } - } //for each iterations - //return the keys we've created - return $keys; -} //end of des_createKeys - -/* -////////////////////////////// TEST ////////////////////////////// -function stringToHex ($s) { - $r = "0x"; - $hexes = array ("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"); - for ($i=0; $i> 4)] . $hexes [(ord($s{$i}) & 0xf)]);} - return $r; -} -echo "
";
-$key = "this is a 24 byte key !!";
-$message = "This is a test message";
-$ciphertext = des ($key, $message, 1, 0, null);
-echo "DES Test Encrypted: " . stringToHex ($ciphertext);
-$recovered_message = des ($key, $ciphertext, 0, 0, null);
-echo "\n";
-echo "DES Test Decrypted: " . $recovered_message;
-*/
-?>
\ No newline at end of file
diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
index b9b99ff57..d5b853db3 100644
--- a/tests/Framework/Utils.php
+++ b/tests/Framework/Utils.php
@@ -426,6 +426,7 @@ class Framework_Utils extends PHPUnit_Framework_TestCase
     function test_random_bytes()
     {
         $this->assertSame(15, strlen(rcube_utils::random_bytes(15)));
+        $this->assertSame(15, strlen(rcube_utils::random_bytes(15, true)));
         $this->assertSame(1, strlen(rcube_utils::random_bytes(1)));
         $this->assertSame(0, strlen(rcube_utils::random_bytes(0)));
         $this->assertSame(0, strlen(rcube_utils::random_bytes(-1)));