e33f3d3b7c
Move smart_str implementation into Zend/
...
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.
2014-09-21 20:49:39 +02:00
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
1e3e9e0bbb
's' and size_t - fix some invalid pointers and the remaining ext/mcrypt parts
2014-08-27 21:53:06 +02:00
6db8d4f829
's' works with size_t round 3
2014-08-27 20:49:36 +02:00
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
3cb5c6e692
fix zpp
2014-08-21 20:13:55 +02:00
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
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
03e9878c78
Fixed mcrypt test case
2014-03-11 20:49:41 +08:00
eb8dfc85ce
Add test for bug #62102 / RFC 2144
...
Using test vectors from RFC 2144, section B.1 (http://tools.ietf.org/rfc/rfc2144.txt )
2014-03-06 22:40:26 +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
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07: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
5bf4c5f82c
Merge branch 'PHP-5.4'
2012-08-13 22:06:43 +02:00
f19351b503
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-13 22:06:18 +02:00
7aed239050
Ask for less random data in mcrypt_create_iv
...
Otherwise the RNG blocks and the test takes a lot of time to run (and
occasionally fails).
2012-08-13 22:01:19 +02:00
9bc1af1e58
Rename mcrypt_cbf -> mcrypt_cfb
...
Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
2012-08-13 22:01:03 +02:00
544f5ad35b
Fix mcrypt_ecb tests after deprecation
2012-08-13 20:30:53 +02: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
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
255913f5f4
- skip if no hash
2011-09-08 10:00:47 +00:00
0e05312d03
- skip if no hash
2011-09-08 10:00:47 +00:00
567fb34eb3
- skip if no hash
2011-09-08 10:00:47 +00:00
30d1410817
Added skipif
2011-09-06 09:19:46 +00:00
17f78b92c4
- add skipif
2011-09-06 06:47:12 +00:00
09b6360c71
- add skipif
2011-09-06 06:47:12 +00:00
7921f410fc
- add skipif
2011-09-06 06:47:12 +00:00
3b7cdd0227
fix failing tests
2011-08-01 01:00:57 +00:00
Nikita Popov