summaryrefslogtreecommitdiff
path: root/ext/mcrypt/mcrypt.c
Commit message (Collapse)AuthorAgeFilesLines
* year++Xinchen Hui2018-01-021-1/+1
|
* Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2017-04-101-2/+2
|\ | | | | | | | | * PHP-7.0: Fixed condition check
| * Fixed condition checkXinchen Hui2017-04-101-2/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-101-1/+3
|\ \ | |/
| * Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warningRobrecht Plaisier2017-01-101-1/+3
| |
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-221-2/+2
|\ \ | |/ | | | | | | * PHP-7.0: remove TSRMLS_*
| * remove TSRMLS_*Anatol Belski2016-11-211-2/+2
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-081-0/+1
|\ \ | |/ | | | | | | * PHP-7.0: fix leak
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-10-081-0/+1
| |\ | | | | | | | | | | | | * PHP-5.6: fix leak
| | * fix leakAnatol Belski2016-10-081-0/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-171-8/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (48 commits) Update NEWs Unused label Fixed bug #72853 (stream_set_blocking doesn't work) fix test Bug #72663 - part 3 Bug #72663 - part 2 Bug #72663 - part 1 Update NEWS BLock test with memory leak fix tests Fix TSRM build Fix bug #72850 - integer overflow in uuencode Fixed bug #72849 - integer overflow in urlencode Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72836 - integer overflow in base64_decode caused heap corruption Fix for bug #72807 - do not produce strings with negative length Fix for bug #72790 and bug #72799 Fix bug #72730 - imagegammacorrect allows arbitrary write access ... Conflicts: ext/standard/var_unserializer.c
| * | Fix for bug #72782: mcrypt accepts only ints, so don't pass anything elseStanislav Malyshev2016-08-101-8/+8
| | |
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-191-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (27 commits) fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not allow reading past error read Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE update NEWS Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders Fix bug #72562 - destroy var_hash properly Fix bug #72551 and bug #72552 - check before converting size_t->int Fix bug #72541 - size_t overflow lead to heap corruption Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID ... Conflicts: ext/standard/basic_functions.c
| * | Fix bug #72551 and bug #72552 - check before converting size_t->intStanislav Malyshev2016-07-121-0/+8
| | |
* | | Use PHP_DEP_FE instead of manually emitting deprecation warningsChristoph M. Becker2016-07-111-85/+37
| | |
* | | Implement RFC: Deprecate (then Remove) McryptChristoph M. Becker2016-07-111-0/+48
| | | | | | | | | | | | | | | <https://wiki.php.net/rfc/mcrypt-viking-funeral> has already been accepted, so we implement it.
* | | Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-051-1/+1
|\ \ \
| * | | E_RECOVERABLE_ERROR -> thrown ErrorAaron Piotrowski2016-06-141-1/+1
| | | |
* | | | Fixed compilation warningsDmitry Stogov2016-06-221-4/+4
| |/ / |/| |
* | | Merge branch 'PHP-5.6.23' into PHP-7.0.8Stanislav Malyshev2016-06-211-1/+9
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.23: (24 commits) iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize update NEWS Fix #66387: Stack overflow with imagefilltoborder Fix bug #72321 - use efree() for emalloc allocation 5.6.23RC1 Fix bug #72140 (segfault after calling ERR_free_strings()) ... Conflicts: configure.in ext/mbstring/php_mbregex.c ext/mcrypt/mcrypt.c ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/php_smart_str.h ext/standard/string.c ext/standard/url.c ext/wddx/wddx.c ext/zip/php_zip.c main/php_version.h
| * Merge branch 'PHP-5.5' into PHP-5.6.23Stanislav Malyshev2016-06-211-35/+43
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize update NEWS Fix #66387: Stack overflow with imagefilltoborder Skip test which is 64bits only 5.5.37 now Conflicts: configure.in ext/mcrypt/mcrypt.c ext/spl/spl_directory.c main/php_version.h
| | * Fix bug #72455: Heap Overflow due to integer overflowsStanislav Malyshev2016-06-201-42/+50
| | |
* | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-031-1/+1
| | | | | | | | | | | | Also re bug #71575.
* | | Format string fixesNikita Popov2016-02-141-2/+2
| | | | | | | | | | | | | | | Conflicts: ext/pgsql/pgsql.c
* | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| | |
* | | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2015-10-031-0/+4
|\ \ \ | |/ /
| * | Fixed bug #70625Nikita Popov2015-10-031-0/+4
| | |
| * | fix bug #69833 mcrypt fd caching not workingAnatol Belski2015-08-111-13/+23
| | |
| * | remove duplicated declaration, fix buildAnatol Belski2015-05-211-6/+0
| | |
* | | improve conditionAnatol Belski2015-08-121-1/+1
| | | | | | | | | | | | same as CSPRNG, break by EOF
* | | integrate static tsrmls cache with ext/mcryptAnatol Belski2015-08-111-0/+6
| | |
* | | add foldsAnatol Belski2015-08-111-4/+4
| | |
* | | don't close stdinAnatol Belski2015-08-091-2/+2
| | |
* | | fix the mcrypt related part of bug #64833Anatol Belski2015-08-091-13/+23
| | |
* | | Cleanup (avoid reallocation)Dmitry Stogov2015-07-011-11/+10
| | |
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-3/+3
| | | | | | | | | | | | semantick changes).
* | | Fixed buildDmitry Stogov2015-05-131-6/+0
| | |
* | | Merge branch 'PHP-5.6'Julien Pauli2015-05-131-8/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Close fd at the end, otherwise people complain Add file descriptor caching to mcrypt_create_iv() Conflicts: ext/mcrypt/mcrypt.c
| * | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-05-131-9/+29
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.5: Close fd at the end, otherwise people complain Add file descriptor caching to mcrypt_create_iv()
| | * Close fd at the end, otherwise people complainLeigh2015-05-131-0/+8
| | | | | | | | | | | | Even though it's closed when the process terminates!
| | * Add file descriptor caching to mcrypt_create_iv()Leigh2015-05-131-15/+21
| | | | | | | | | | | | | | | This improves performance for applications that make repeated calls to mcrypt_create_iv()
| | * Bump yearXinchen Hui2015-01-151-1/+1
| | |
| * | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | cleanup the mod version macros, round 2Anatol Belski2015-03-231-1/+1
| | |
* | | Removed deprecated mcrypt_ecb() etcNikita Popov2015-03-091-100/+0
| | |
* | | Remove deprecated mcrypt_generic_end() aliasNikita Popov2015-03-091-1/+0
| | |
* | | Ported mcryptXinchen Hui2015-02-031-5/+13
| | |
View Lorry Controller Status