Skip to content

Commit

Permalink
Reodering see and link tags in docblock.
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuswilms committed Jun 17, 2011
1 parent 51c7540 commit d92b03c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions security/Password.php
Expand Up @@ -69,15 +69,15 @@ class Password {
* $check2 = Password::check($password, $hashed2); // True
* }}}
*
* @see lithium\security\Password::check()
* @see lithium\security\Password::salt()
* @param string $password The password to hash.
* @param string $salt Optional. The salt string.
* @return string The hashed password.
* The result's length will be:
* - 60 chars long for Blowfish hashes
* - 20 chars long for XDES hashes
* - 34 chars long for MD5 hashes
* @see lithium\security\Password::check()
* @see lithium\security\Password::salt()
*/
public static function hash($password, $salt = null) {
return crypt($password, $salt ?: static::salt());
Expand All @@ -88,11 +88,11 @@ public static function hash($password, $salt = null) {
* comparison, this method uses a constant-time algorithm to defend against
* [timing attacks](http://codahale.com/a-lesson-in-timing-attacks/).
*
* @see lithium\security\Password::hash()
* @see lithium\security\Password::salt()
* @param string $password The password to check.
* @param string $hash The hashed password to compare it to.
* @return boolean Returns a boolean indicating whether the password is correct.
* @see lithium\security\Password::hash()
* @see lithium\security\Password::salt()
*/
public static function check($password, $hash) {
$password = crypt($password, $hash);
Expand Down Expand Up @@ -135,6 +135,11 @@ public static function check($password, $hash) {
* consisting in random sequences of alpha numeric characters, use
* `lithium\util\String::random()` instead.
*
* @link http://php.net/manual/en/function.crypt.php
* @link http://www.postgresql.org/docs/9.0/static/pgcrypto.html
* @see lithium\security\Password::hash()
* @see lithium\security\Password::check()
* @see lithium\util\String::random()
* @param string $type The hash type. Optional. Defaults to the best
* available option. Supported values, along with their maximum
* password lengths, include:
Expand All @@ -146,11 +151,6 @@ public static function check($password, $hash) {
* - `10` for Blowfish
* - `18` for XDES
* @return string The salt string.
* @link http://php.net/manual/en/function.crypt.php
* @link http://www.postgresql.org/docs/9.0/static/pgcrypto.html
* @see lithium\security\Password::hash()
* @see lithium\security\Password::check()
* @see lithium\util\String::random()
*/
public static function salt($type = null, $count = null) {
switch (true) {
Expand Down

0 comments on commit d92b03c

Please sign in to comment.