summaryrefslogtreecommitdiff
path: root/ext/mcrypt
Commit message (Collapse)AuthorAgeFilesLines
* Format string fixesNikita Popov2016-02-141-2/+2
| | | | | Conflicts: ext/pgsql/pgsql.c
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-014-4/+4
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-014-4/+4
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2015-10-032-0/+21
|\ \ | |/
| * Fixed bug #70625Nikita Popov2015-10-032-0/+21
| |
| * fix bug #69833 mcrypt fd caching not workingAnatol Belski2015-08-111-13/+23
| |
| * remove duplicated declaration, fix buildAnatol Belski2015-05-211-6/+0
| |
* | Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more ↵Dmitry Stogov2015-09-241-5/+5
| | | | | | | | appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
* | improve conditionAnatol Belski2015-08-121-1/+1
| | | | | | | | same as CSPRNG, break by EOF
* | integrate static tsrmls cache with ext/mcryptAnatol Belski2015-08-114-7/+9
| |
* | 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-132-8/+29
|\ \ | |/ | | | | | | | | | | | | | | * 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-132-9/+30
| |\ | | | | | | | | | | | | | | | * 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-132-15/+22
| | | | | | | | | | | | | | | This improves performance for applications that make repeated calls to mcrypt_create_iv()
| | * Bump yearXinchen Hui2015-01-154-4/+4
| | |
* | | Merge branch 'PHP-5.6'Xinchen Hui2015-04-121-25/+0
|\ \ \ | |/ /
| * | Remove failing testXinchen Hui2015-04-121-25/+0
| | | | | | | | | | | | | | | <nikic> [19:57:28] debian has a libmcrypt patch that makes it work <nikic> [19:57:43] but not all other distros have it
| * | bump yearXinchen Hui2015-01-154-4/+4
| | |
* | | cleanup the mod version macros, round 2Anatol Belski2015-03-232-1/+4
| | |
* | | Removed deprecated mcrypt_ecb() etcNikita Popov2015-03-0922-2701/+44
| | |
* | | Remove deprecated mcrypt_generic_end() aliasNikita Popov2015-03-091-1/+0
| | |
* | | Ported mcryptXinchen Hui2015-02-031-5/+13
| | |
* | | bump yearXinchen Hui2015-01-154-4/+4
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-103-43/+43
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-132-80/+80
| | |
* | | Merge branch 'PHP-5.6'Dmitry Stogov2014-12-081-2/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Fixed possible read after end of buffer and use after free.
| * | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-12-081-2/+6
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Fixed possible read after end of buffer and use after free.
| | * Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-12-081-2/+6
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: Fixed possible read after end of buffer and use after free.
| | | * Fixed possible read after end of buffer and use after free.Dmitry Stogov2014-12-081-2/+6
| | | |
| | | * Bump yearXinchen Hui2014-01-034-4/+4
| | | |
| | | * Happy New YearXinchen Hui2013-01-014-4/+4
| | | |
| | * | Bump yearXinchen Hui2014-01-034-4/+4
| | | |
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-235-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-235-6/+6
| | | |
* | | | fix datatype mismatch warningsAnatol Belski2014-10-311-5/+5
| | | |
* | | | fix datatype mismatch warningsAnatol Belski2014-10-311-14/+14
| | | |
* | | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-117/+0
| | | |
* | | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-204-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-194-4/+4
| | | | |
* | | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-4/+4
|/ / / /
* | | | 's' and size_t - fix some invalid pointers and the remaining ext/mcrypt partsAnatol Belski2014-08-271-5/+5
| | | |
* | | | 's' works with size_t round 3Anatol Belski2014-08-271-7/+7
| | | |
* | | | first show to make 's' work with size_tAnatol Belski2014-08-271-9/+9
| | | |
View Lorry Controller Status