net/phpldapadmin: update to 1.2.6.2 release

Set option pecl-mpcrypt for password hashes
Project moved to GitHub

PR:		245815
Approved by:	maintainer

1 files changed, 0 insertions, 124 deletions

diff --git a/net/phpldapadmin/files/patch-lib__functions.php b/net/phpldapadmin/files/patch-lib__functions.php
deleted file mode 100644
index 7680a23812ea..000000000000
--- a/net/phpldapadmin/files/patch-lib__functions.php
+++ /dev/null
@@ -1,124 +0,0 @@
---- lib/functions.php.orig	2012-10-01 06:54:14 UTC
-+++ lib/functions.php
-@@ -51,7 +51,7 @@ if (file_exists(LIBDIR.'functions.custom
- /**
-  * Loads class definition
-  */
--function __autoload($className) {
-+function pla_autoloader($className) {
- 	if (file_exists(HOOKSDIR."classes/$className.php"))
- 		require_once(HOOKSDIR."classes/$className.php");
- 	elseif (file_exists(LIBDIR."$className.php"))
-@@ -65,6 +65,7 @@ function __autoload($className) {
- 				__METHOD__,_('Called to load a class that cant be found'),$className),
- 			'type'=>'error'));
- }
-+spl_autoload_register('pla_autoloader');
- 
- /**
-  * Strips all slashes from the specified array in place (pass by ref).
-@@ -745,6 +746,7 @@ function blowfish_encrypt($data,$secret=
- 	if (! trim($secret))
- 		return $data;
- 
-+/*
- 	if (function_exists('mcrypt_module_open') && ! empty($data)) {
- 		$td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
- 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
-@@ -754,6 +756,7 @@ function blowfish_encrypt($data,$secret=
- 
- 		return $encrypted_data;
- 	}
-+*/
- 
- 	if (file_exists(LIBDIR.'blowfish.php'))
- 		require_once LIBDIR.'blowfish.php';
-@@ -801,6 +804,7 @@ function blowfish_decrypt($encdata,$secr
- 	if (! trim($secret))
- 		return $encdata;
- 
-+/*
- 	if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
- 		$td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
- 		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
-@@ -810,6 +814,7 @@ function blowfish_decrypt($encdata,$secr
- 
- 		return $decrypted_data;
- 	}
-+*/
- 
- 	if (file_exists(LIBDIR.'blowfish.php'))
- 		require_once LIBDIR.'blowfish.php';
-@@ -1080,7 +1085,7 @@ function masort(&$data,$sortby,$rev=0) {
- 
- 		$code .= 'return $c;';
- 
--		$CACHE[$sortby] = create_function('$a, $b',$code);
-+		$CACHE[$sortby] = function($a, $b) { global $code; return $code; };
- 	}
- 
- 	uasort($data,$CACHE[$sortby]);
-@@ -2127,7 +2132,7 @@ function password_types() {
-  *        crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
-  * @return string The hashed password.
-  */
--function password_hash($password_clear,$enc_type) {
-+function password_hash_custom($password_clear,$enc_type) {
- 	if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
- 		debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
- 
-@@ -2318,7 +2323,7 @@ function password_check($cryptedpassword
- 
- 		# SHA crypted passwords
- 		case 'sha':
--			if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
-+			if (strcasecmp(password_hash_custom($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
- 				return true;
- 			else
- 				return false;
-@@ -2327,7 +2332,7 @@ function password_check($cryptedpassword
- 
- 		# MD5 crypted passwords
- 		case 'md5':
--			if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
-+			if( strcasecmp(password_hash_custom($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
- 				return true;
- 			else
- 				return false;
-@@ -2392,7 +2397,7 @@ function password_check($cryptedpassword
- 
- 		# SHA512 crypted passwords
- 		case 'sha512':
--			if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
-+			if (strcasecmp(password_hash_custom($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0)
- 				return true;
- 			else
- 				return false;
-@@ -2564,13 +2569,24 @@ function dn_unescape($dn) {
- 	if (is_array($dn)) {
- 		$a = array();
- 
--		foreach ($dn as $key => $rdn)
--			$a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+		foreach ($dn as $key => $rdn) {
-+			$a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+				function ($m) {
-+					return ''.chr(hexdec('\\1')).'';
-+				},
-+				$rdn
-+			);
-+		}
- 
- 		return $a;
- 
- 	} else {
--		return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+		 return  preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+			 function ($m) {
-+				return ''.chr(hexdec('\\1')).'';
-+			},
-+			$dn
-+		);
- 	}
- }
-