extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

This looks like this has been a long time problem. The mcrypt_generic_init() needed to be called before _EVERY_ mcrypt_generic() and mdecrypt_generic() call. There is a change in the functionality of decrypt now. When decrypting complex object structures, it does not automatically unserialize the object. This is to give the app developer the ability to reset stdClass types to the appropriate class they should be.

Browse Source
This commit is contained in:
skeeter 2001-06-16 19:02:31 +00:00
parent e71dc5f440
commit 7e2334d9c7
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
phpgwapi/inc/class.crypto.inc.php
View File

@ -25,6 +25,8 @@
class crypto
{
var $enabled = False;
var $mcrypt_version = '';
var $td = False; // Handle for mcrypt
var $iv = '';
var $key = '';
@ -36,7 +38,9 @@
$iv = $vars[1];
if ($phpgw_info['server']['mcrypt_enabled'] && extension_loaded('mcrypt'))
{
if ($phpgw_info['server']['versions']['mcrypt'] == 'old')
$this->enabled = True;
$this->mcrypt_version = $phpgw_info['server']['versions']['mcrypt'];
if ($this->mcrypt_version == 'old')
{
$this->td = false;
if (phpversion() > '4.0.2pl1')
@ -73,10 +77,6 @@
{
$this->key .= $key[$i % $x];
}
if ($phpgw_info['server']['versions']['mcrypt'] != 'old')
{
mcrypt_generic_init ($this->td, $this->key, $this->iv);
}
}
// If mcrypt isn't loaded key and iv are not needed
}
@ -85,9 +85,9 @@
{
global $phpgw_info;
if ($phpgw_info['server']['mcrypt_enabled'] && extension_loaded('mcrypt'))
if ($this->enabled)
{
if ($phpgw_info['server']['versions']['mcrypt'] != 'old')
if ($this->mcrypt_version != 'old')
{
mcrypt_generic_end ($this->td);
}
@ -97,7 +97,7 @@
function hex2bin($data)
{
$len = strlen($data);
return pack('H' . $len, $data);
return pack('H'.$len, $data);
}
function encrypt($data)
@ -105,11 +105,12 @@
global $phpgw_info;
$data = serialize($data);
$data = addslashes($data);
// Disable all encryption if the admin didn't set it up
if ($phpgw_info['server']['mcrypt_enabled'] && extension_loaded('mcrypt'))
if ($this->enabled)
{
switch ($phpgw_info['server']['versions']['mcrypt'])
switch ($this->mcrypt_version)
{
// The old code, only works with mcrypt <= 2.2.x
case 'old':
@ -119,7 +120,9 @@
}
default:
{ // Handle 2.4 and newer API
mcrypt_generic_init ($this->td, $this->key, $this->iv);
$encrypteddata = mcrypt_generic($this->td, $data);
break;
}
}
$encrypteddata = bin2hex($encrypteddata);
@ -136,28 +139,34 @@
global $phpgw_info;
// Disable all encryption if the admin didn't set it up
if ($phpgw_info['server']['mcrypt_enabled'] && extension_loaded('mcrypt'))
if ($this->enabled)
{
$data = $this->hex2bin($encrypteddata);
switch ($phpgw_info['server']['versions']['mcrypt'])
switch ($this->mcrypt_version)
{
// The old code, only works with mcrypt <= 2.2.x
case 'old':
{
$data = mcrypt_cbc(MCRYPT_TripleDES, $this->key, $data, MCRYPT_DECRYPT);
break;
}
// Handle 2.4 and newer API
default:
{ // Handle 2.4 and newer API
mcrypt_generic_init ($this->td, $this->key, $this->iv);
$data = mdecrypt_generic($this->td, $data);
}
break;
}
}
else
{
$data = $encrypteddata;
}
$data = stripslashes($data);
if(!strpos(' '.$data,'O:8:"stdClass"'))
{
return unserialize($data);
}
else
{
return unserialize($encrypteddata);
return $data;
}
}
} // class crypto