1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

[feature/passwords] Rename "crypto" files to "passwords" files

PHPBB3-11610
This commit is contained in:
Marc Alexander
2013-09-14 14:04:48 +02:00
parent b810957c4b
commit 19512b2595
13 changed files with 135 additions and 135 deletions

View File

@@ -16,28 +16,28 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
abstract class phpbb_crypto_driver_base implements phpbb_crypto_driver_interface
abstract class phpbb_passwords_driver_base implements phpbb_passwords_driver_interface
{
/** @var phpbb_config */
protected $config;
/** @var phpbb_crypto_driver_helper */
/** @var phpbb_passwords_driver_helper */
protected $helper;
/** @var driver name */
protected $name;
/**
* Constructor of crypto driver object
* Constructor of passwords driver object
*
* @return string Hash prefix
*/
public function __construct(phpbb_config $config)
{
$this->config = $config;
$this->helper = new phpbb_crypto_driver_helper($this);
$this->helper = new phpbb_passwords_driver_helper($this);
}
/**

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_driver_bcrypt extends phpbb_crypto_driver_base
class phpbb_passwords_driver_bcrypt extends phpbb_passwords_driver_base
{
const PREFIX = '$2a$';

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_driver_bcrypt_2y extends phpbb_crypto_driver_bcrypt
class phpbb_passwords_driver_bcrypt_2y extends phpbb_passwords_driver_bcrypt
{
const PREFIX = '$2y$';

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_driver_helper
class phpbb_passwords_driver_helper
{
/** @var phpbb_config */
protected $driver;
@@ -30,7 +30,7 @@ class phpbb_crypto_driver_helper
public $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
/**
* Constructor of crypto driver helper object
* Constructor of passwords driver helper object
*/
public function __construct($driver)
{

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
interface phpbb_crypto_driver_interface
interface phpbb_passwords_driver_interface
{
/**
* Check if hash type is supported

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_driver_phpass extends phpbb_crypto_driver_salted_md5
class phpbb_passwords_driver_phpass extends phpbb_passwords_driver_salted_md5
{
const PREFIX = '$P$';

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_driver_salted_md5 extends phpbb_crypto_driver_base
class phpbb_passwords_driver_salted_md5 extends phpbb_passwords_driver_base
{
const PREFIX = '$H$';

View File

@@ -16,12 +16,12 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_helper
class phpbb_passwords_helper
{
/**
* @var phpbb_crypto_manager
* @var phpbb_passwords_manager
*/
protected $manager;
@@ -31,9 +31,9 @@ class phpbb_crypto_helper
protected $container;
/**
* Construct a phpbb_crypto_helper object
* Construct a phpbb_passwords_helper object
*
* @param phpbb_crypto_manager $manager Crypto manager object
* @param phpbb_passwords_manager $manager Crypto manager object
* @param phpbb_container $container phpBB container object
*/
public function __construct($manager, $container)

View File

@@ -16,9 +16,9 @@ if (!defined('IN_PHPBB'))
}
/**
* @package crypto
* @package passwords
*/
class phpbb_crypto_manager
class phpbb_passwords_manager
{
/**
* Default hashing method
@@ -37,7 +37,7 @@ class phpbb_crypto_manager
/**
* Crypto helper
* @var phpbb_crypto_helper
* @var phpbb_passwords_helper
*/
protected $helper;
@@ -54,7 +54,7 @@ class phpbb_crypto_manager
protected $container;
/**
* Construct a crypto object
* Construct a passwords object
*
* @param phpbb_config $config phpBB configuration
*/
@@ -65,7 +65,7 @@ class phpbb_crypto_manager
$this->type = $default;
$this->fill_type_map($hashing_algorithms);
$this->load_crypto_helper();
$this->load_passwords_helper();
}
/**
@@ -85,13 +85,13 @@ class phpbb_crypto_manager
}
/**
* Load crypto helper class
* Load passwords helper class
*/
protected function load_crypto_helper()
protected function load_passwords_helper()
{
if ($this->helper === null)
{
$this->helper = new phpbb_crypto_helper($this, $this->container);
$this->helper = new phpbb_passwords_helper($this, $this->container);
}
}
@@ -170,7 +170,7 @@ class phpbb_crypto_manager
$hashing_algorithm = $this->container->get($type);
// Do not support 8-bit characters with $2a$ bcrypt
if ($type === 'crypto.driver.bcrypt' || ($type === 'crypto.driver.bcrypt_2y' && !$hashing_algorithm->is_supported()))
if ($type === 'passwords.driver.bcrypt' || ($type === 'passwords.driver.bcrypt_2y' && !$hashing_algorithm->is_supported()))
{
if (ord($password[strlen($password)-1]) & 128)
{