Commit Graph

53 Commits

Author SHA1 Message Date
Stanislav Malyshev
3fe509443c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix unit tests
2015-09-01 12:24:14 -07:00
Stanislav Malyshev
4aeff30337 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix unit tests
2015-09-01 12:23:55 -07:00
Stanislav Malyshev
1922c650ba fix unit tests 2015-09-01 12:23:22 -07:00
Stanislav Malyshev
c19d59c550 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  add NEWS for fixes
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	ext/zip/php_zip.c
2015-09-01 12:06:41 -07:00
Stanislav Malyshev
33d3acaae7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
	configure.in
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_version.h
2015-09-01 11:42:19 -07:00
Stanislav Malyshev
1390a5812b Fix bug #70312 - HAVAL gives wrong hashes in specific cases 2015-09-01 01:16:30 -07:00
Stanislav Malyshev
5776fceb16 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: (27 commits)
  fix non-standard C
  update NEWS
  5.4.41 next
  fix CVE num
  update NEWS
  Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
  fix test
  fix type in fix for #69085
  fix memory leak & add test
  Fix tests
  fix CVE num
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
2015-04-14 01:05:01 -07:00
Stanislav Malyshev
0cb9d75cb6 Merge branch 'PHP-5.4.40' into PHP-5.5.24
* PHP-5.4.40:
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
2015-04-11 16:56:12 -07:00
Stanislav Malyshev
4435b9142f Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) 2015-04-11 16:53:22 -07:00
Rouven Weßling
2148a88b3d Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks. 2014-03-17 09:37:28 +01:00
Nikita Popov
e617dfbdf3 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-12 14:16:58 +01:00
Nikita Popov
06bbb657ad Fix hash_pbkdf2() with missing $length argument
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
2014-03-12 14:16:18 +01:00
Michael M Slusarz
b88387d341 Fix #66698: Add fnv1a32 and fnv1a64 hash options 2014-03-06 23:38:51 +01:00
Manuel Mausz
7dbb1bba64 fix failing tests 2013-09-05 09:32:12 +02:00
Manuel Mausz
8ca43527e8 Add support for CryptoPro S-box for GOST
This adds a new hash identifier "gost-crypto" which uses the CryptoPro
S-box tables as specified by RFC 4357, section 11.2.
2013-09-05 01:04:25 +02:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Stanislav Malyshev
8ac131503d Merge branch 'PHP-5.5'
* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Anthony Ferrara
2129c70896 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #64745 hash_pbkdf2 truncation issue
2013-05-28 15:38:11 -04:00
Anthony Ferrara
540a5a52e8 Fix #64745 hash_pbkdf2 truncation issue
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
2013-05-28 15:30:45 -04:00
Sara Golemon
6aefaad46e Fix race condition when ext/hash/tests run in parallel 2013-04-30 16:28:37 -07:00
Anthony Ferrara
2f1cd2cb13 Fix tests to use proper casing 2012-06-12 14:52:43 -04:00
Anthony Ferrara
6387498823 Create hash_pbkdf2 function addition 2012-06-12 09:57:11 -04:00
Michael Wallner
260e77709d fix tests failing due to corrected hash tiger
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order

fixes bug #60922:
 tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
2012-03-19 21:49:47 +01:00
Michael Wallner
6a7bbb1561 merge ext/hash from trunk 2012-01-18 09:15:34 +00:00
Xinchen Hui
42fd7352fb Add skipif 2011-09-06 09:29:04 +00:00
Pierre Joye
45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Felipe Pena
e66279a55e - Fixed bug #52240 (hash_copy() does not copy the HMAC key, causes wrong results and PHP crashes) 2010-07-03 13:06:14 +00:00
Martin Jansen
71ec12cc78 JOAAT hashing now supports incremental hashing. 2010-03-28 10:01:02 +00:00
Martin Jansen
2bc269d375 Fixed test for the recently added algorithmus and made it more
debuggable by adding the names of the algorithmus to the output.
2010-03-25 16:05:27 +00:00
Martin Jansen
3842a993fe Added Jenkins's one-at-a-time hash support to ext/hash. 2010-03-24 15:47:40 +00:00
Michael Maclean
d05ce25746 Add FNV-1 support to ext/hash 2010-03-23 22:21:39 +00:00
Scott MacVicar
27a1ce801c MFH Fix bug #48284 - adler32 is in the wrong order. Changed to match what zlib produces. 2009-06-30 13:21:53 +00:00
andy wharmby
c41cc6aaed New hash extension tests. Tested on Windows, Linux and Linux 64-bit 2009-01-07 14:32:46 +00:00
Felipe Pena
4cf4b5bf44 - MFH: Fix test 2008-12-27 01:05:07 +00:00
Felipe Pena
c0611c10ef - Fixed condition 2008-10-26 23:34:13 +00:00
Antony Dovgal
eaec817e1b update tests 2008-09-18 12:16:15 +00:00
Scott MacVicar
d875c9f889 MFH: mhash algorithm parameter was modified when it was a zval, also update a test. 2008-09-18 11:59:13 +00:00
Antony Dovgal
523cccc09d MFH: fix bug #45028 (CRC32 output endianness is different between crc32() and hash()) 2008-08-18 14:29:55 +00:00
Scott MacVicar
cc7e8970de Make the old mhash API a wrapper around hash, this removes a dependency. 2008-06-26 22:33:16 +00:00
Raghubansh Kumar
24f01f7ab0 New testcases for hash_file(), Committed for Felix De Vliegher, TestFest Task No: 75 & 76, Tested on RHEL5 -32bit, WinXP-32bit 2008-06-24 15:44:50 +00:00
Antony Dovgal
2ac1ba6254 fix tests 2008-06-04 07:38:10 +00:00
Scott MacVicar
d06e683922 Correct test name 2008-06-02 14:14:26 +00:00
Scott MacVicar
b83fbba9f3 Add sha224 support. 2008-06-02 12:24:23 +00:00
Antony Dovgal
7c98e674b5 [DOC] add hash_copy() to be able to copy hash resource 2008-04-21 15:37:46 +00:00
Sara Golemon
2eb308ff75 Backport md2, ripemd256, and ripemd320 algos from HEAD 2006-11-15 20:06:09 +00:00
Michael Wallner
3cfdbdbd12 - add adler32 test 2005-12-03 10:31:01 +00:00