GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE] Add Argon2I support

Browse Source 
Add Argon2I support, disabled by default.
This commit is contained in:
Daniel Supernault 2018-03-11 20:39:47 -06:00 committed by Diogo Cordeiro
parent 912f2c3567
commit c09f1c2443
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/AuthCrypt/AuthCryptPlugin.php
View File

@ -36,6 +36,7 @@ class AuthCryptPlugin extends AuthenticationPlugin
protected $hash = '$6$'; // defaults to SHA512, i.e. '$6$', in onInitializePlugin() protected $hash = '$6$'; // defaults to SHA512, i.e. '$6$', in onInitializePlugin()
protected $statusnet = true; // if true, also check StatusNet style password hash protected $statusnet = true; // if true, also check StatusNet style password hash
protected $overwrite = true; // if true, password change means overwrite with crypt() protected $overwrite = true; // if true, password change means overwrite with crypt()
protected $argon = false; // Use Argon if supported.
public $provider_name = 'password_hash'; // not actually used public $provider_name = 'password_hash'; // not actually used
@ -115,10 +116,16 @@ class AuthCryptPlugin extends AuthenticationPlugin
public function hashPassword($password, Profile $profile=null) public function hashPassword($password, Profile $profile=null)
{ {
if(function_exists('password_hash')) { if(function_exists('password_hash')) {
$algorithm = PASSWORD_DEFAULT;
if($this->argon && version_compare(PHP_VERSION, '7.2.0') == 1) {
$algorithm = PASSWORD_ARGON2I;
}
// Use the modern password hashing algorithm // Use the modern password hashing algorithm
// http://php.net/manual/en/function.password-hash.php // http://php.net/manual/en/function.password-hash.php
// Uses PASSWORD_BCRYPT by default, with PASSWORD_ARGON2I being the next possible default in future versions // Uses PASSWORD_BCRYPT by default, with PASSWORD_ARGON2I being the next possible default in future versions
return password_hash($password, PASSWORD_DEFAULT); return password_hash($password, $algorithm);
} else { } else {
// Fallback to previous hashing function if phpversion() < 5.5 // Fallback to previous hashing function if phpversion() < 5.5
// A new, unique salt per new record stored... // A new, unique salt per new record stored...