summaryrefslogtreecommitdiff
path: root/ext/mcrypt/mcrypt.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | ...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.
| * | | Abort on missing IV if the enc_mode requires itNikita Popov2014-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the code fell back on using a NUL IV if no IV was passed and the encryption mode required it. This is dangerous and makes no sense from a practical point of view (as you could just as well use ECB then).
| * | | Abort on invalid IV sizeNikita Popov2014-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if the size of the IV did not match the block size mcrypt would throw a warning and fall back to a NUL IV. This behavior is both dangerous and makes no practical sense. mcrypt_encrypt etc. will now return false if the IV has an incorrect size.
* | | | Cleanup (1-st round)Dmitry Stogov2014-04-151-2/+2
|/ / /
* | | Bump yearXinchen Hui2014-01-031-1/+1
|/ /
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Fixed Mcrypt deprecated functions and related testsSherif Ramadan2012-08-161-3/+3
| |
* | Fixes mcrypt_ecb not issuing an E_DEPRECATED level notice, despite having ↵Sherif Ramadan2012-07-211-1/+1
| | | | | | | | been deprecated for some time. Please reference bug #62374 as well.
* | - Year++Felipe Pena2012-01-011-1/+1
| |
* | - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| |
* | - use warning here to match unix behaviorPierre Joye2011-07-101-1/+1
|/
* - Year++Felipe Pena2011-01-011-1/+1
|
* - use new function to get random bytesPierre Joye2010-06-081-19/+9
|
* - fix leak on error in mcrypt_create_iv on windowsPierre Joye2010-06-021-0/+2
|
* - WSPierre Joye2010-06-021-3/+3
|
* add filters to mcryptStanislav Malyshev2010-01-151-0/+9
| | | | | # trunk will follow soon
* sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.phpSebastian Bergmann2010-01-031-1/+1
|
* - Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes).Sriram Natarajan2009-10-021-0/+1
|
* MFH: Fixed error message grammar:Matt Wilmas2009-06-061-1/+1
| | | | | | | | | - "cannot" instead of "can not" (meaning "also can") - "than" instead of "then" (Hint: "then" should hardly be needed; you're not telling the order in which to do something) ... plus removed a couple ending. dots
* MFH: Fixed compiler warningKalle Sommer Nielsen2009-05-191-1/+1
|
* MFH: Bump copyright year, 3 of 3.Sebastian Bergmann2008-12-311-1/+1
|
* - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macroFelipe Pena2008-11-171-36/+0
|
* - Revert ZEND_BEGIN_ARG_INFO changeFelipe Pena2008-11-021-0/+36
|
* - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macroFelipe Pena2008-10-241-36/+0
|
* - MFH: Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode)Felipe Pena2008-09-071-11/+12
|
* - New parameter parsing APIFelipe Pena2008-08-101-139/+97
|
* - MFH: Port mcrypt_create_iv to windows (aka fix it on windows)Pierre Joye2008-07-151-0/+23
|
* - Revert that crap.Derick Rethans2008-07-041-273/+393
|
* fix key container accessRob Richards2008-07-031-1/+1
|
* - fix mcrypt_iv on windows, use urandom equivalentPierre Joye2008-07-031-393/+273
| | | | | - MFH, code cleaning and reorganisation
* - Added arginfoFelipe Pena2008-07-011-42/+266
|
* Revert.David Soria Parra2008-05-181-6/+1
|
* Make mcrypt_enc_self_test() return value compatible with documentation and ↵David Soria Parra2008-05-181-1/+6
| | | | mcrypt _module_self_test()
* MFH: Bump copyright year, 2 of 2.Sebastian Bergmann2007-12-311-1/+1
|
* - MFH: Fixed bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB).Derick Rethans2007-12-011-2/+3
|
* Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)Dmitry Stogov2007-09-271-1/+1
|
* fix ws & foldingAntony Dovgal2007-07-191-36/+12
|
* Fixed bug #40999 (mcrypt_create_iv() not using random seed).Ilia Alshanetsky2007-04-051-2/+2
|
* use constantIlia Alshanetsky2007-02-151-1/+1
|