diff options
author | Remi Collet <remi@php.net> | 2019-07-10 09:00:41 +0200 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2019-07-10 09:00:41 +0200 |
commit | db0eaa8cf1cbeeec5968a5f91a416541d354ccfe (patch) | |
tree | 3bba357e967e57e0c6a2d768462dc5d99e0b059e /ext/standard/password.c | |
parent | 48abed7fd89a50c568ab3f5932fbc85ba93dae79 (diff) | |
download | php-git-db0eaa8cf1cbeeec5968a5f91a416541d354ccfe.tar.gz |
improve libargon2/libsodium compatibility
Diffstat (limited to 'ext/standard/password.c')
-rw-r--r-- | ext/standard/password.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ext/standard/password.c b/ext/standard/password.c index aacb30e61c..a12590c0e0 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -571,6 +571,21 @@ static const php_password_algo* php_password_algo_find_zval_ex(zval *arg, const #if HAVE_ARGON2LIB case 2: return &php_password_algo_argon2i; case 3: return &php_password_algo_argon2id; +#else + case 2: + { + zend_string *n = zend_string_init("argon2i", sizeof("argon2i")-1, 0); + const php_password_algo* ret = php_password_algo_find(n); + zend_string_release(n); + return ret; + } + case 3: + { + zend_string *n = zend_string_init("argon2id", sizeof("argon2id")-1, 0); + const php_password_algo* ret = php_password_algo_find(n); + zend_string_release(n); + return ret; + } #endif } return NULL; |