diff options
| author | Charles R. Portwood II <charlesportwoodii@erianna.com> | 2016-07-08 15:31:30 -0500 |
|---|---|---|
| committer | Charles R. Portwood II <charlesportwoodii@erianna.com> | 2016-07-08 15:31:30 -0500 |
| commit | 3c7fb71a90dcd37ba64dd0623aea13c9d940fe06 (patch) | |
| tree | 73ffcf64810696879236308e99286ad8edc23be9 /ext/standard/password.c | |
| parent | de85c2e526755fc4cbf48536133821261e69fcc9 (diff) | |
| download | php-git-3c7fb71a90dcd37ba64dd0623aea13c9d940fe06.tar.gz | |
Introducing Argon2 memory, time, and lanes constants
PASSWORD_ARGON2_MEMORY_COST
PASSWORD_ARGON2_TIME_COST
PASSWORD_ARGON2_LANES
Diffstat (limited to 'ext/standard/password.c')
| -rw-r--r-- | ext/standard/password.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ext/standard/password.c b/ext/standard/password.c index 82ed9fa7c3..4da1682056 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -44,6 +44,10 @@ PHP_MINIT_FUNCTION(password) /* {{{ */ REGISTER_LONG_CONSTANT("PASSWORD_BCRYPT_DEFAULT_COST", PHP_PASSWORD_BCRYPT_COST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_MEMORY_COST", PHP_PASSWORD_ARGON2_MEMORY_COST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_TIME_COST", PHP_PASSWORD_ARGON2_TIME_COST, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_LANES", PHP_PASSWORD_ARGON2_LANES, CONST_CS | CONST_PERSISTENT); + return SUCCESS; } /* }}} */ @@ -180,9 +184,9 @@ PHP_FUNCTION(password_get_info) case PHP_PASSWORD_ARGON2I: case PHP_PASSWORD_ARGON2D: { - zend_long m_cost = PHP_ARGON2_M_COST; - zend_long t_cost = PHP_ARGON2_T_COST; - zend_long lanes = PHP_ARGON2_LANES; + zend_long m_cost = PHP_PASSWORD_ARGON2_MEMORY_COST; + zend_long t_cost = PHP_PASSWORD_ARGON2_TIME_COST; + zend_long lanes = PHP_PASSWORD_ARGON2_LANES; sscanf(hash, "$%*[argon2id]$v=%*ld$m=" ZEND_LONG_FMT ",t=" ZEND_LONG_FMT ",p=" ZEND_LONG_FMT, &m_cost, &t_cost, &lanes); add_assoc_long(&options, "m_cost", m_cost); @@ -239,9 +243,9 @@ PHP_FUNCTION(password_needs_rehash) case PHP_PASSWORD_ARGON2I: case PHP_PASSWORD_ARGON2D: { - zend_long new_m_cost = PHP_ARGON2_M_COST, m_cost = 0; - zend_long new_t_cost = PHP_ARGON2_T_COST, t_cost = 0; - zend_long new_lanes = PHP_ARGON2_LANES, lanes = 0; + zend_long new_m_cost = PHP_PASSWORD_ARGON2_MEMORY_COST, m_cost = 0; + zend_long new_t_cost = PHP_PASSWORD_ARGON2_TIME_COST, t_cost = 0; + zend_long new_lanes = PHP_PASSWORD_ARGON2_LANES, lanes = 0; if (options && (option_buffer = zend_hash_str_find(options, "m_cost", sizeof("m_cost")-1)) != NULL) { new_m_cost = zval_get_long(option_buffer); |