summaryrefslogtreecommitdiffstats
path: root/php-7.4.20-argon2.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-16 06:59:14 +0200
committerRemi Collet <remi@remirepo.net>2021-06-16 06:59:14 +0200
commit278c8a3a2c0e77dad4463e08ea0d773087c3543c (patch)
tree4cba5cb2545a67a45e281e81fd30cc875fa73097 /php-7.4.20-argon2.patch
parentbe8a124151211e6716302c53957d1a55b6dd5cc9 (diff)
update to 7.4.21RC1
ignore unsupported "threads" option on password_hash
Diffstat (limited to 'php-7.4.20-argon2.patch')
-rw-r--r--php-7.4.20-argon2.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/php-7.4.20-argon2.patch b/php-7.4.20-argon2.patch
new file mode 100644
index 0000000..73a1452
--- /dev/null
+++ b/php-7.4.20-argon2.patch
@@ -0,0 +1,15 @@
+diff --git a/ext/sodium/sodium_pwhash.c b/ext/sodium/sodium_pwhash.c
+index 2b284c7116..4a453255e2 100644
+--- a/ext/sodium/sodium_pwhash.c
++++ b/ext/sodium/sodium_pwhash.c
+@@ -64,10 +64,6 @@ static inline int get_options(zend_array *options, size_t *memlimit, size_t *ops
+ 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;
+ }
+