[Pkg-php-commits] [php/debian-sid] =?utf-8?q?Author:=20Ond=C5=99ej=20Sur=C3=BD=20<ondrej at debian.org>

[Ondřej Surý]

=20=20salt,=20which=20I=20have=20fixed=20in=20the=20code=20(php=5Fcrypt=5Frevamped.patch).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

---
 debian/patches/series                       |    1 +
 debian/patches/use_system_crypt_fixes.patch |   35 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/use_system_crypt_fixes.patch

diff --git a/debian/patches/series b/debian/patches/series
index 5cb33ac..14f7d0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -52,3 +52,4 @@ fix_broken_locale_tests.patch
 fix_broken_gd_bundled-specific_tests.patch
 CVE-2010-0397.patch
 enchant_unaligned_memory_access.patch
+use_system_crypt_fixes.patch
diff --git a/debian/patches/use_system_crypt_fixes.patch b/debian/patches/use_system_crypt_fixes.patch
new file mode 100644
index 0000000..5f3d095
--- /dev/null
+++ b/debian/patches/use_system_crypt_fixes.patch
@@ -0,0 +1,35 @@
+--- a/ext/standard/tests/strings/bug51059.phpt
++++ b/ext/standard/tests/strings/bug51059.phpt
+@@ -3,7 +3,7 @@ Bug #51059 crypt() segfaults on certain 
+ --FILE--
+ <?php
+ $res = crypt('a', '_');
+-if ($res == '*0' || $res == '*1') echo 'OK';
++if ($res == '__DAZ.Z4ErJDo') echo 'OK';
+ else echo 'Not OK';
+ 
+ ?>
+--- a/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
++++ b/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
+@@ -3,8 +3,8 @@ Test Blowfish crypt() with invalid round
+ --FILE--
+ <?php
+ 
+-foreach(range(32, 38) as $i) {
+-  if (crypt('U*U', '$2a$'.$i.'$CCCCCCCCCCCCCCCCCCCCCC$') === FALSE) {
++foreach(array_merge(range(00, 03), range(32, 38)) as $i) {
++  if (crypt('U*U', '$2a$'.$i.'$CCCCCCCCCCCCCCCCCCCCCC$') === '$2SHYF.wPGyfE') {
+     echo "$i. OK\n";
+   } else {
+     echo "$i. Not OK\n";
+@@ -13,6 +13,10 @@ foreach(range(32, 38) as $i) {
+ 
+ ?>
+ --EXPECT--
++0. OK
++1. OK
++2. OK
++3. OK
+ 32. OK
+ 33. OK
+ 34. OK
-- 
1.6.3.3