From 9b24fda5cd1f6e85c536dc2bc3e5f1bbdef5b7c2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 19 Jul 2013 20:49:24 +0200 Subject: [feature/passwords] Move files after namespacing changes PHPBB3-11610 --- phpBB/includes/crypto/driver/helper.php | 143 -------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 phpBB/includes/crypto/driver/helper.php (limited to 'phpBB/includes/crypto/driver/helper.php') diff --git a/phpBB/includes/crypto/driver/helper.php b/phpBB/includes/crypto/driver/helper.php deleted file mode 100644 index 308ee7dce2..0000000000 --- a/phpBB/includes/crypto/driver/helper.php +++ /dev/null @@ -1,143 +0,0 @@ -driver = $driver; - } - - /** - * Base64 encode hash - * - * @param string $input Input string - * @param int $count Input string length - * - * @return string base64 encoded string - */ - public function hash_encode64($input, $count) - { - $output = ''; - $i = 0; - - do - { - $value = ord($input[$i++]); - $output .= $this->itoa64[$value & 0x3f]; - - if ($i < $count) - { - $value |= ord($input[$i]) << 8; - } - - $output .= $this->itoa64[($value >> 6) & 0x3f]; - - if ($i++ >= $count) - { - break; - } - - if ($i < $count) - { - $value |= ord($input[$i]) << 16; - } - - $output .= $this->itoa64[($value >> 12) & 0x3f]; - - if ($i++ >= $count) - { - break; - } - - $output .= $this->itoa64[($value >> 18) & 0x3f]; - } - while ($i < $count); - - return $output; - } - - /** - * Return unique id - * @param string $extra additional entropy - * - * @return string Unique id - */ - public function unique_id($extra = 'c') - { - static $dss_seeded = false; - global $config; - - $val = $config['rand_seed'] . microtime(); - $val = md5($val); - $config['rand_seed'] = md5($config['rand_seed'] . $val . $extra); - - if ($dss_seeded !== true && ($config['rand_seed_last_update'] < time() - rand(1,10))) - { - set_config('rand_seed_last_update', time(), true); - set_config('rand_seed', $config['rand_seed'], true); - $dss_seeded = true; - } - - return substr($val, 4, 16); - } - - /** - * Get random salt with specified length - * - * @param int $length Salt length - */ - public function get_random_salt($length) - { - $random = ''; - - if (($fh = @fopen('/dev/urandom', 'rb'))) - { - $random = fread($fh, $length); - fclose($fh); - } - - if (strlen($random) < $length) - { - $random = ''; - $random_state = $this->unique_id(); - - for ($i = 0; $i < $length; $i += 16) - { - $random_state = md5($this->unique_id() . $random_state); - $random .= pack('H*', md5($random_state)); - } - $random = substr($random, 0, $length); - } - return $random; - } -} -- cgit v1.2.1