From a64a9da6f34a7bc2f568cdd25027342993e42283 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 May 2016 17:09:39 +0200 Subject: php-pecl-scrypt: 1.4.2 --- scrypt-pr47.patch | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 scrypt-pr47.patch (limited to 'scrypt-pr47.patch') 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 -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; -- cgit