diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-03-25 07:44:01 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-25 08:08:42 +0000 |
| commit | 13863cc1f5f194a380e822e4dd6a6f548864f6b0 (patch) | |
| tree | 02b8c097b4eb0df608ca4cef66857cdc509d0b96 /main/php/php-fix-crypt.patch | |
| parent | 964fda4bc0702462cde06433ab1e0de517f1531a (diff) | |
| download | aports-13863cc1f5f194a380e822e4dd6a6f548864f6b0.tar.bz2 aports-13863cc1f5f194a380e822e4dd6a6f548864f6b0.tar.xz | |
main/php: fix sha256/512 passwords
ref #5141
Diffstat (limited to 'main/php/php-fix-crypt.patch')
| -rw-r--r-- | main/php/php-fix-crypt.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/main/php/php-fix-crypt.patch b/main/php/php-fix-crypt.patch deleted file mode 100644 index caa6a2e22..000000000 --- a/main/php/php-fix-crypt.patch +++ /dev/null @@ -1,41 +0,0 @@ -Reported upstream: -https://bugs.php.net/bug.php?id=67512 - ---- php-5.5.13/ext/standard/crypt.c.orig 2014-06-25 13:10:38.930010191 -0300 -+++ php-5.5.13/ext/standard/crypt.c 2014-06-25 13:45:09.762124864 -0300 -@@ -228,18 +228,20 @@ - } - } - #else -- --# if defined(HAVE_CRYPT_R) && (defined(_REENTRANT) || defined(_THREAD_SAFE)) - { --# if defined(CRYPT_R_STRUCT_CRYPT_DATA) -+# if defined(HAVE_CRYPT_R) -+# if defined(CRYPT_R_STRUCT_CRYPT_DATA) - struct crypt_data buffer; - memset(&buffer, 0, sizeof(buffer)); --# elif defined(CRYPT_R_CRYPTD) -+# elif defined(CRYPT_R_CRYPTD) - CRYPTD buffer; --# else --# error Data struct used by crypt_r() is unknown. Please report. --# endif -+# else -+# error Data struct used by crypt_r() is unknown. Please report. -+# endif - crypt_res = crypt_r(password, salt, &buffer); -+# else -+ crypt_res = crypt(passwrd, salt); -+#endif - if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) { - return FAILURE; - } else { -@@ -247,7 +249,6 @@ - return SUCCESS; - } - } --# endif - #endif - } - /* }}} */ |