summaryrefslogtreecommitdiff
path: root/ext/standard/password.c
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2019-07-07 21:55:12 -0400
committerSara Golemon <pollita@php.net>2019-07-07 21:55:12 -0400
commit17bfac6347431ba7ac8de3eb2be0c4238acea107 (patch)
treed97749b1d36a285a89ac8aa37942f6f7f617381a /ext/standard/password.c
parent27b6d36f98bc9f9ec7de0b8b5be975b3f4ab4acd (diff)
parent0ba1db7a4ab035e00dcb3089ef45820054c5a1cf (diff)
downloadphp-git-17bfac6347431ba7ac8de3eb2be0c4238acea107.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Provide argon2i(d) password hashing from sodium when needed
Diffstat (limited to 'ext/standard/password.c')
-rw-r--r--ext/standard/password.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/password.c b/ext/standard/password.c
index 3c24c7c9c0..7cf1cb68c8 100644
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -450,6 +450,8 @@ PHP_MINIT_FUNCTION(password) /* {{{ */
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_MEMORY_COST", PHP_PASSWORD_ARGON2_MEMORY_COST, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_TIME_COST", PHP_PASSWORD_ARGON2_TIME_COST, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PASSWORD_ARGON2_DEFAULT_THREADS", PHP_PASSWORD_ARGON2_THREADS, CONST_CS | CONST_PERSISTENT);
+
+ REGISTER_STRING_CONSTANT("PASSWORD_ARGON2_PROVIDER", "standard", CONST_CS | CONST_PERSISTENT);
#endif
return SUCCESS;