summaryrefslogtreecommitdiffstats
path: root/scrypt-pr47.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-05-18 17:09:39 +0200
committerRemi Collet <fedora@famillecollet.com>2016-05-18 17:09:39 +0200
commita64a9da6f34a7bc2f568cdd25027342993e42283 (patch)
tree46e675a7e6de98313109c64f29052d05a81e6b1e /scrypt-pr47.patch
parentddec9282cad68321aebbacea9a9b049f0c6a25c0 (diff)
php-pecl-scrypt: 1.4.2
Diffstat (limited to 'scrypt-pr47.patch')
-rw-r--r--scrypt-pr47.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/scrypt-pr47.patch b/scrypt-pr47.patch
deleted file mode 100644
index 459c153..0000000
--- a/scrypt-pr47.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 52f0b3dbc28a2acbcce356ee657081ff12acd20d Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 18 May 2016 14:59:34 +0200
-Subject: [PATCH] fix zend_parse_parameters call, fix #46
-
----
- php_scrypt.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/php_scrypt.c b/php_scrypt.c
-index 97c38f1..df1f04f 100644
---- a/php_scrypt.c
-+++ b/php_scrypt.c
-@@ -43,6 +43,12 @@
-
- #include "math.h"
-
-+#if PHP_MAJOR_VERSION >= 7
-+typedef size_t strsize_t;
-+#else
-+typedef int strsize_t;
-+#endif
-+
- /* {{{ arginfo */
- ZEND_BEGIN_ARG_INFO_EX(scrypt_arginfo, 0, 0, 6)
- ZEND_ARG_INFO(0, password)
-@@ -115,10 +121,10 @@ PHP_FUNCTION(scrypt)
- {
- /* Variables for PHP's parameters */
- unsigned char *password;
-- int password_len;
-+ strsize_t password_len;
-
- unsigned char *salt;
-- int salt_len;
-+ strsize_t salt_len;
-
- long phpN;
- long phpR;