Skip to content

Fix #78516: password_hash(): Memory cost is outside of allowed memory… #4695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix #78516: password_hash(): Memory cost is outside of allowed memory… #4695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad6c899
Fix #78516: password_hash(): Memory cost is outside of allowed memory…
cmb69 Sep 10, 2019
90288c4
Add trailing linefeed
cmb69 Sep 10, 2019
bfc1c43
Extract function
cmb69 Sep 13, 2019
b7a076c
Move default option value handling to get_options()
cmb69 Sep 14, 2019
292cb6b
Don't multiply default by 1k when getting hash info
cmb69 Sep 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 40 additions & 48 deletions ext/sodium/sodium_pwhash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,40 +40,52 @@
#define PHP_SODIUM_PWHASH_OPSLIMIT 4
#define PHP_SODIUM_PWHASH_THREADS 1

static inline int get_options(zend_array *options, size_t *memlimit, size_t *opslimit) {
zval *opt;

*opslimit = PHP_SODIUM_PWHASH_OPSLIMIT;
*memlimit = PHP_SODIUM_PWHASH_MEMLIMIT << 10;
if (!options) {
return SUCCESS;
}
if ((opt = zend_hash_str_find(options, "memory_cost", strlen("memory_cost")))) {
zend_long smemlimit = zval_get_long(opt);

if ((smemlimit < 0) || (smemlimit < crypto_pwhash_MEMLIMIT_MIN >> 10) || (smemlimit > (crypto_pwhash_MEMLIMIT_MAX >> 10))) {
php_error_docref(NULL, E_WARNING, "Memory cost is outside of allowed memory range");
return FAILURE;
}
*memlimit = smemlimit << 10;
}
if ((opt = zend_hash_str_find(options, "time_cost", strlen("time_cost")))) {
*opslimit = zval_get_long(opt);
if ((*opslimit < crypto_pwhash_OPSLIMIT_MIN) || (*opslimit > crypto_pwhash_OPSLIMIT_MAX)) {
php_error_docref(NULL, E_WARNING, "Time cost is outside of allowed time range");
return FAILURE;
}
}
if ((opt = zend_hash_str_find(options, "threads", strlen("threads"))) && (zval_get_long(opt) != 1)) {
php_error_docref(NULL, E_WARNING, "A thread value other than 1 is not supported by this implementation");
return FAILURE;
}
return SUCCESS;
}

static zend_string *php_sodium_argon2_hash(const zend_string *password, zend_array *options, int alg) {
size_t opslimit = PHP_SODIUM_PWHASH_OPSLIMIT;
size_t memlimit = PHP_SODIUM_PWHASH_MEMLIMIT;
size_t opslimit, memlimit;
zend_string *ret;

if ((ZSTR_LEN(password) >= 0xffffffff)) {
php_error_docref(NULL, E_WARNING, "Password is too long");
return NULL;
}

if (options) {
zval *opt;
if ((opt = zend_hash_str_find(options, "memory_cost", strlen("memory_cost")))) {
memlimit = zval_get_long(opt);
if ((memlimit < crypto_pwhash_MEMLIMIT_MIN) || (memlimit > crypto_pwhash_MEMLIMIT_MAX)) {
php_error_docref(NULL, E_WARNING, "Memory cost is outside of allowed memory range");
return NULL;
}
}
if ((opt = zend_hash_str_find(options, "time_cost", strlen("time_cost")))) {
opslimit = zval_get_long(opt);
if ((opslimit < crypto_pwhash_OPSLIMIT_MIN) || (opslimit > crypto_pwhash_OPSLIMIT_MAX)) {
php_error_docref(NULL, E_WARNING, "Time cost is outside of allowed time range");
return NULL;
}
}
if ((opt = zend_hash_str_find(options, "threads", strlen("threads"))) && (zval_get_long(opt) != 1)) {
php_error_docref(NULL, E_WARNING, "A thread value other than 1 is not supported by this implementation");
return NULL;
}
if (get_options(options, &memlimit, &opslimit) == FAILURE) {
return NULL;
}

ret = zend_string_alloc(crypto_pwhash_STRBYTES - 1, 0);
if (crypto_pwhash_str_alg(ZSTR_VAL(ret), ZSTR_VAL(password), ZSTR_LEN(password), opslimit, memlimit << 10, alg)) {
if (crypto_pwhash_str_alg(ZSTR_VAL(ret), ZSTR_VAL(password), ZSTR_LEN(password), opslimit, memlimit, alg)) {
php_error_docref(NULL, E_WARNING, "Unexpected failure hashing password");
zend_string_release(ret);
return NULL;
Expand All @@ -93,32 +105,12 @@ static zend_bool php_sodium_argon2_verify(const zend_string *password, const zen
}

static zend_bool php_sodium_argon2_needs_rehash(const zend_string *hash, zend_array *options) {
size_t opslimit = PHP_SODIUM_PWHASH_OPSLIMIT;
size_t memlimit = PHP_SODIUM_PWHASH_MEMLIMIT;

if (options) {
zval *opt;
if ((opt = zend_hash_str_find(options, "memory_cost", strlen("memory_cost")))) {
memlimit = zval_get_long(opt);
if ((memlimit < crypto_pwhash_MEMLIMIT_MIN) || (memlimit > crypto_pwhash_MEMLIMIT_MAX)) {
php_error_docref(NULL, E_WARNING, "Memory cost is outside of allowed memory range");
return 1;
}
}
if ((opt = zend_hash_str_find(options, "time_cost", strlen("time_cost")))) {
opslimit = zval_get_long(opt);
if ((opslimit < crypto_pwhash_OPSLIMIT_MIN) || (opslimit > crypto_pwhash_OPSLIMIT_MAX)) {
php_error_docref(NULL, E_WARNING, "Time cost is outside of allowed time range");
return 1;
}
}
if ((opt = zend_hash_str_find(options, "threads", strlen("threads"))) && (zval_get_long(opt) != 1)) {
php_error_docref(NULL, E_WARNING, "A thread value other than 1 is not supported by this implementation");
return 1;
}
}
size_t opslimit, memlimit;

return crypto_pwhash_str_needs_rehash(ZSTR_VAL(hash), opslimit, memlimit << 10);
if (get_options(options, &memlimit, &opslimit) == FAILURE) {
return 1;
}
return crypto_pwhash_str_needs_rehash(ZSTR_VAL(hash), opslimit, memlimit);
}

static int php_sodium_argon2_get_info(zval *return_value, const zend_string *hash) {
Expand Down
18 changes: 18 additions & 0 deletions ext/sodium/tests/bug78516.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
Bug #78516 (password_hash(): Memory cost is outside of allowed memory range)
--SKIPIF--
<?php
if (!extension_loaded('sodium')) die('skip sodium extension not available');
?>
--FILE--
<?php
$pass = password_hash('secret', PASSWORD_ARGON2ID, ['memory_cost' => 8191]);
password_needs_rehash($pass, PASSWORD_ARGON2ID, ['memory_cost' => 8191]);
var_dump(password_get_info($pass)['options']['memory_cost']);
$pass = password_hash('secret', PASSWORD_ARGON2I, ['memory_cost' => 8191]);
password_needs_rehash($pass, PASSWORD_ARGON2I, ['memory_cost' => 8191]);
var_dump(password_get_info($pass)['options']['memory_cost']);
?>
--EXPECT--
int(8191)
int(8191)