From 1c5da8157593e8b39f96a37be012b590f3fd51f2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 16 Jun 2021 06:44:22 +0200
Subject: update to 7.4.21RC1 ignore unsupported "threads" option on
 password_hash

---
 php-7.4.20-argon2.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 php-7.4.20-argon2.patch

(limited to 'php-7.4.20-argon2.patch')

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;
+ }
+ 
-- 
cgit