Revert "Merge branch 'PHP-5.6' into PHP-7.0"

This reverts commit 946335ba706b7dbfe70a5fc9a1e74ee46af19cfe, reversing
changes made to 3437dbfa0097d3c5be69d4efb26a2ecb3edf5168.

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index bca3bd1363ee43ffc2cc0ab52972284df158d0bb..66b37eb79ea77cf1e6127c746e40cdc5c0f4a560 100644 (file)
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -204,14 +204,6 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch
                                salt[1] == '2' &&
                                salt[3] == '$') {
                        char output[PHP_MAX_SALT_LEN + 1];
-                       int k = 7;
-
-                       while (isalnum(salt[k]) || '.' == salt[k] || '/' == salt[k]) {
-                               k++;
-                       }
-                       if (k != salt_len) {
-                               return NULL;
-                       }
 
                        memset(output, 0, PHP_MAX_SALT_LEN + 1);
 

diff --git a/ext/standard/tests/strings/bug72703.phpt b/ext/standard/tests/strings/bug72703.phpt
deleted file mode 100644 (file)
index 5e3bf48..0000000
--- a/ext/standard/tests/strings/bug72703.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
---SKIPIF--
-<?php
-if (!function_exists('crypt'))) {
-       die("SKIP crypt() is not available");
-}
-?> 
---FILE--
-<?php
-       var_dump(password_verify("","$2y$10$$"));
-?>
-==OK==
---EXPECT--
-bool(false)
-==OK==
-