summaryrefslogtreecommitdiff
path: root/ext/mcrypt/mcrypt.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-41/+41
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-59/+59
| | |
* | | 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-031-1/+1
| | | |
| | | * Happy New YearXinchen Hui2013-01-011-1/+1
| | | |
| | | * - Year++Felipe Pena2012-01-011-1/+1
| | | |
| | | * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| | | |
| | | * - remove magic quotes support, functions are kept (see the NEWS entry for ↵Pierre Joye2011-07-221-1/+1
| | | | | | | | | | | | | | | | the details) for BC reasons but do not allow to set enable MQ
| | | * - use warning here to match unix behaviorPierre Joye2011-07-101-1/+1
| | | |
| | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
* | | | fix datatype mismatch warningsAnatol Belski2014-10-311-14/+14
| | | |
* | | | 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.
* | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | | |
* | | | '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
| | | |
* | | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-4/+4
| | | |
* | | | master renames phase 1Anatol Belski2014-08-251-25/+25
| | | |
* | | | fix zppAnatol Belski2014-08-211-3/+3
| | | |
* | | | basic macro replacements, all at onceAnatol Belski2014-08-191-27/+27
| | | |
* | | | In most user extensions functions like mysql_close() should use ↵Dmitry Stogov2014-05-131-2/+2
| | | | | | | | | | | | | | | | zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter.
* | | | ...krakjoe2014-05-061-1/+1
| | | |
* | | | fix leaks in herekrakjoe2014-05-061-5/+13
| | | |
* | | | fix for phpng, failing RFC2144 testkrakjoe2014-05-061-27/+27
| | | |
* | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-137/+157
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * | | Use /dev/urandom as the default mcrypt_create_iv() sourceNikita Popov2014-03-111-11/+11
| | | | | | | | | | | | | | | | | | | | Also fixes the ARGINFO for mcrypt_create_iv() and adds missing UPGRADING entries.
| * | | Use zpp for accepting encryption mode stringNikita Popov2014-03-051-14/+14
| | | | | | | | | | | | | | | | | | | | Leaving the non-zpp usage for the mcrypt_{MODE} functions, as they're deprecated and I'm too lazy to update all their tests.
| * | | Remove a number of macros that are no longer usedNikita Popov2014-03-051-42/+0
| | | |
| * | | Provide expected IV length in IV error messagesNikita Popov2014-03-051-14/+28
| | | |
| * | | Call mcrypt_module_close on errorNikita Popov2014-03-051-0/+4
| | | |
| * | | Print supported key sizes in error messageNikita Popov2014-03-051-18/+70
| | | |
| * | | Clean up do_crypt codeNikita Popov2014-03-051-61/+57
| | | | | | | | | | | | | | | | | | | | Avoid unnecessary alloc/copy/free cycles and clean up structure in general. Add a few extra checks for the key length.
| * | | Abort on invalid key sizeNikita Popov2014-03-051-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously an incorrectly sized key was either silently padded with NUL bytes or truncated. Especially the silent nature of this behavior makes it extremely easy to use weak encryption. A common mistake - which has also been extensively made in our tests - is to use a password instead of a key. Incorrectly sized keys will now be rejected.