- load des.inc file only when needed

release-0.6
alecpl 15 years ago
parent cd96fd6727
commit 44155cddc2

@ -30,7 +30,6 @@ require_once('lib/utf7.inc');
require_once('include/rcube_shared.inc');
// fallback if not PHP modules are available
@include_once('lib/des.inc');
@include_once('lib/utf8.class.php');
// define constannts for input reading

@ -1064,22 +1064,24 @@ class rcmail
mcrypt_generic_deinit($td);
mcrypt_module_close($td);
}
else if (function_exists('des'))
{
define('DES_IV_SIZE', 8);
else {
@include_once('lib/des.inc');
if (function_exists('des')) {
$des_iv_size = 8;
$iv = '';
for ($i = 0; $i < constant('DES_IV_SIZE'); $i++)
for ($i = 0; $i < $des_iv_size; $i++)
$iv .= sprintf("%c", mt_rand(0, 255));
$cipher = $iv . des($this->config->get_crypto_key($key), $clear, 1, 1, $iv);
}
else
{
else {
raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Could not perform encryption; make sure Mcrypt is installed or lib/des.inc is available"
), true, true);
}
}
return $base64 ? base64_encode($cipher) : $cipher;
}
@ -1110,21 +1112,23 @@ class rcmail
mcrypt_generic_deinit($td);
mcrypt_module_close($td);
}
else if (function_exists('des'))
{
define('DES_IV_SIZE', 8);
$iv = substr($cipher, 0, constant('DES_IV_SIZE'));
$cipher = substr($cipher, constant('DES_IV_SIZE'));
else {
@include_once('lib/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($this->config->get_crypto_key($key), $cipher, 0, 1, $iv);
}
else
{
else {
raise_error(array(
'code' => 500, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Could not perform decryption; make sure Mcrypt is installed or lib/des.inc is available"
), true, true);
}
}
/*-
* Trim PHP's padding and the canary byte; see note in

Loading…
Cancel
Save