Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
55d5bace0e
more usages for ZEND_SECURE_ZERO()
2014-09-19 01:59:55 +02:00
Anatol Belski
c45f4f5461
generalized the case with secure memory zeroing
2014-09-19 01:46:14 +02:00
Anatol Belski
a4532f6d4d
fix hash_pbkdf2()
2014-08-28 08:55:05 +02:00
Anatol Belski
6db8d4f829
's' works with size_t round 3
2014-08-27 20:49:36 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
7815d23e9e
fix zpp and a bit more
2014-08-21 20:22:18 +02:00
Anatol Belski
729bce4321
fix hash
2014-08-19 22:57:07 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Lior Kaplan
1953438ca0
RETVAL_STRING takes only one variable
...
Follow up for commit f4cfaf36
2014-07-22 19:38:35 +03:00
Lior Kaplan
da81873a46
RETURN_STRINGL takes only two variables
...
Follow up for commit f4cfaf36
2014-07-22 19:38:35 +03:00
Pierre Joye
5fa4e047b0
unused var
2014-05-15 11:36:40 +02:00
Dmitry Stogov
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
Nikita Popov
58089c5977
Port ext/hash
...
Unsure what to do about hash_final
2014-04-23 20:34:05 +02:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Rouven Weßling
2148a88b3d
Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.
2014-03-17 09:37:28 +01:00
Nikita Popov
e617dfbdf3
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-12 14:16:58 +01:00
Nikita Popov
06bbb657ad
Fix hash_pbkdf2() with missing $length argument
...
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
2014-03-12 14:16:18 +01:00
Michael M Slusarz
b88387d341
Fix #66698 : Add fnv1a32 and fnv1a64 hash options
2014-03-06 23:38:51 +01:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Manuel Mausz
7dbb1bba64
fix failing tests
2013-09-05 09:32:12 +02:00
Manuel Mausz
0be6ecb862
fix indention
2013-09-05 01:19:00 +02:00
Manuel Mausz
8ca43527e8
Add support for CryptoPro S-box for GOST
...
This adds a new hash identifier "gost-crypto" which uses the CryptoPro
S-box tables as specified by RFC 4357, section 11.2.
2013-09-05 01:04:25 +02:00
Michael Wallner
611122c22e
Merge branch '2Guploads'
...
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
2013-08-09 11:47:25 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
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
Stanislav Malyshev
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
Veres Lajos
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Anthony Ferrara
2129c70896
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #64745 hash_pbkdf2 truncation issue
2013-05-28 15:38:11 -04:00
Anthony Ferrara
540a5a52e8
Fix #64745 hash_pbkdf2 truncation issue
...
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
2013-05-28 15:30:45 -04:00
Sara Golemon
6aefaad46e
Fix race condition when ext/hash/tests run in parallel
2013-04-30 16:28:37 -07:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Anthony Ferrara
03536e889a
More cleanup of documentation and comments, as well as code formatting
2012-06-12 15:05:44 -04:00
Anthony Ferrara
2f1cd2cb13
Fix tests to use proper casing
2012-06-12 14:52:43 -04:00
Anthony Ferrara
43eb8dc04a
Remove un-needed memset, and replacing stray spaces
2012-06-12 14:32:21 -04:00
Anthony Ferrara
df3d351cad
Update error messages to be more inline with PHP standards
2012-06-12 14:10:35 -04:00
Anthony Ferrara
4918acccc6
refactor away un-necessary casts in hashing routines
2012-06-12 14:09:16 -04:00
Anthony Ferrara
6387498823
Create hash_pbkdf2 function addition
2012-06-12 09:57:11 -04:00
Michael Wallner
260e77709d
fix tests failing due to corrected hash tiger
...
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order
fixes bug #60922 :
tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
2012-03-19 21:49:47 +01:00