clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext/sodium: call crypto_pwhash_argon2id() explicitly if required

Browse Source
This commit is contained in:
Frank Denis 2017-09-26 18:09:00 +02:00
parent 47d75394c9
commit 33b4405d84
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/sodium/libsodium.c
View File

@ -1856,6 +1856,7 @@ PHP_FUNCTION(sodium_crypto_pwhash)
zend_long alg;
size_t passwd_len;
size_t salt_len;
int ret;
alg = (zend_long) crypto_pwhash_ALG_DEFAULT;
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "lssll|l",
@ -1905,11 +1906,22 @@ PHP_FUNCTION(sodium_crypto_pwhash)
zend_error(E_WARNING, "maximum memory for the password hashing function is low");
}
hash = zend_string_alloc((size_t) hash_len, 0);
if (crypto_pwhash
((unsigned char *) ZSTR_VAL(hash), (unsigned long long) hash_len,
passwd, (unsigned long long) passwd_len, salt,
(unsigned long long) opslimit, (size_t) memlimit,
(int) alg) != 0) {
ret = -1;
# ifdef crypto_pwhash_ALG_ARGON2ID13
if (alg == crypto_pwhash_ALG_ARGON2ID13) {
ret = crypto_pwhash_argon2id
((unsigned char *) ZSTR_VAL(hash), (unsigned long long) hash_len,
passwd, (unsigned long long) passwd_len, salt,
(unsigned long long) opslimit, (size_t) memlimit, (int) alg);
}
# endif
if (ret == -1) {
ret = crypto_pwhash
((unsigned char *) ZSTR_VAL(hash), (unsigned long long) hash_len,
passwd, (unsigned long long) passwd_len, salt,
(unsigned long long) opslimit, (size_t) memlimit, (int) alg);
}
if (ret != 0) {
zend_string_free(hash);
zend_throw_exception(sodium_exception_ce, "internal error", 0);
return;