nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch #2665440 Detect mcrypt initialization failure

Browse Source
This commit is contained in:
Herman van Rink
2009-05-07 07:56:13 +00:00
parent 99035b8da4
commit 9df074aad3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -61,6 +61,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
thanks to Virsacer - virsacer thanks to Virsacer - virsacer
+ rfe #2657696 Automatically copy generated password + rfe #2657696 Automatically copy generated password
- bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view - bug #2787162 [interface] Table with name 'log_views' is incorrectly displayed as a view
+ patch #2665440 Detect mcrypt initialization failure
3.1.5.0 (not yet released) 3.1.5.0 (not yet released)
- patch #2739001 [export] XML does not allow spaces in element names, - patch #2739001 [export] XML does not allow spaces in element names,

6
libraries/auth/cookie.auth.lib.php
View File

@@ -34,7 +34,11 @@ if (function_exists('mcrypt_encrypt')) {
if (empty($_COOKIE['pma_mcrypt_iv']) if (empty($_COOKIE['pma_mcrypt_iv'])
|| false === ($iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true))) { || false === ($iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true))) {
srand((double) microtime() * 1000000); srand((double) microtime() * 1000000);
$iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_BLOWFISH, MCRYPT_MODE_CBC), MCRYPT_RAND); $td = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, '');
if ($td === false) {
trigger_error(PMA_sanitize(sprintf($strCantLoad, 'mcrypt')), E_USER_WARNING);
}
$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
PMA_setCookie('pma_mcrypt_iv', base64_encode($iv)); PMA_setCookie('pma_mcrypt_iv', base64_encode($iv));
} }