b8b8c497c4
In most user extensions functions like mysql_close() should use 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.
2014-05-13 13:18:00 +04:00
b2fe1c1648
...
2014-05-06 11:22:15 +01:00
7f32ffbf89
fix leaks in here
2014-05-06 11:20:54 +01:00
4187be99fe
fix for phpng, failing RFC2144 test
2014-05-06 09:08:02 +01:00
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
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
2014-04-26 00:32:51 +04:00
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
fd5fbba98c
Use /dev/urandom as the default mcrypt_create_iv() source
...
Also fixes the ARGINFO for mcrypt_create_iv() and adds missing
UPGRADING entries.
2014-03-11 14:06:13 +01:00
d8ed84e4c4
Use zpp for accepting encryption mode string
...
Leaving the non-zpp usage for the mcrypt_{MODE} functions, as
they're deprecated and I'm too lazy to update all their tests.
2014-03-05 15:32:32 +01:00
eb0eac75ef
Remove a number of macros that are no longer used
2014-03-05 15:32:32 +01:00
e5738d3bc9
Provide expected IV length in IV error messages
2014-03-05 15:32:32 +01:00
b9737aa08e
Call mcrypt_module_close on error
2014-03-05 15:32:32 +01:00
e4876ecbfb
Print supported key sizes in error message
2014-03-05 15:32:32 +01:00
32333abe3e
Clean up do_crypt code
...
Avoid unnecessary alloc/copy/free cycles and clean up structure in
general. Add a few extra checks for the key length.
2014-03-05 15:32:32 +01:00
a861a3a93d
Abort on invalid key size
...
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.
2014-03-05 15:32:32 +01:00
25d801f97e
Abort on missing IV if the enc_mode requires it
...
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).
2014-03-05 15:32:31 +01:00
c4b7cdb41e
Abort on invalid IV size
...
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.
2014-03-05 15:32:31 +01:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
7014a0eb6d
Fixed Mcrypt deprecated functions and related tests
2012-08-16 10:21:22 -04:00
29a0efccef
Fixes mcrypt_ecb not issuing an E_DEPRECATED level notice, despite having been deprecated for some time. Please reference bug #62374 as well.
2012-07-21 19:38:03 -04:00
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
da376383e8
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
b8dd53b713
- use warning here to match unix behavior
2011-07-10 14:19:51 +00:00
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
cdaa87f57e
- use new function to get random bytes
2010-06-08 18:27:23 +00:00
b03678348c
- fix leak on error in mcrypt_create_iv on windows
2010-06-02 15:27:38 +00:00
8296e705bf
- WS
2010-06-02 10:07:26 +00:00
932e276c0b
add filters to mcrypt
...
# trunk will follow soon
2010-01-15 21:02:20 +00:00
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
0f57b15e23
- Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes).
2009-10-02 00:13:53 +00:00
1fa3b21c15
MFH: Fixed error message grammar:
...
- "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
2009-06-06 02:40:49 +00:00
6068ce7469
MFH: Fixed compiler warning
2009-05-19 17:47:06 +00:00
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +00:00
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +00:00
df10005563
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 14:35:40 +00:00
49fc9c9e13
- MFH: Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode)
2008-09-07 22:57:37 +00:00
af7918cf0f
- New parameter parsing API
2008-08-10 05:38:07 +00:00
597d411627
- MFH: Port mcrypt_create_iv to windows (aka fix it on windows)
2008-07-15 17:05:02 +00:00
3657b0ab5c
- Revert that crap.
2008-07-04 07:47:18 +00:00
74bc652de8
fix key container access
2008-07-03 19:40:15 +00:00
f0ec9b9475
- fix mcrypt_iv on windows, use urandom equivalent
...
- MFH, code cleaning and reorganisation
2008-07-03 13:50:14 +00:00
7294562366
- Added arginfo
2008-07-01 19:43:42 +00:00
fbc29e2848
Revert.
2008-05-18 19:48:40 +00:00
472b883cc6
Make mcrypt_enc_self_test() return value compatible with documentation and mcrypt _module_self_test()
2008-05-18 17:08:56 +00:00
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
fd73296bf2
- MFH: Fixed bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB).
2007-12-01 17:20:45 +00:00
6c810b0d4c
Improved memory usage by movig constants to read only memory. (Dmitry, Pierre)
2007-09-27 18:00:48 +00:00
79e53b202c
fix ws & folding
2007-07-19 14:32:55 +00:00
ed0f0e4a67
Fixed bug #40999 (mcrypt_create_iv() not using random seed).
2007-04-05 01:48:56 +00:00
Dmitry Stogov