Commit Graph

299 Commits

Author SHA1 Message Date
Ant Phillips
4faa1f1624 MCrypt tests: checked on PHP 5.2.6, 5.3 and 6.0 (Windows and Linux but not Linux 64 bit or 5.3). 2008-12-11 10:21:38 +00:00
Felipe Pena
8b00dc3f9e - Changed split() to preg_split() 2008-11-20 23:11:25 +00:00
Felipe Pena
83a6215dcc - Fixed test 2008-11-20 13:27:00 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Felipe Pena
49fc9c9e13 - MFH: Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode) 2008-09-07 22:57:37 +00:00
Felipe Pena
af7918cf0f - New parameter parsing API 2008-08-10 05:38:07 +00:00
Pierre Joye
f428f1e04a - MFH: not shared 2008-08-05 17:20:10 +00:00
Pierre Joye
e31b2cbc0d - MFH: detect _a or normal lib 2008-08-04 21:39:44 +00:00
Pierre Joye
597d411627 - MFH: Port mcrypt_create_iv to windows (aka fix it on windows) 2008-07-15 17:05:02 +00:00
Derick Rethans
3657b0ab5c - Revert that crap. 2008-07-04 07:47:18 +00:00
Rob Richards
74bc652de8 fix key container access 2008-07-03 19:40:15 +00:00
Pierre Joye
f0ec9b9475 - fix mcrypt_iv on windows, use urandom equivalent
- MFH, code cleaning and reorganisation
2008-07-03 13:50:14 +00:00
Felipe Pena
7294562366 - Added arginfo 2008-07-01 19:43:42 +00:00
David Soria Parra
fbc29e2848 Revert. 2008-05-18 19:48:40 +00:00
David Soria Parra
472b883cc6 Make mcrypt_enc_self_test() return value compatible with documentation and mcrypt _module_self_test() 2008-05-18 17:08:56 +00:00
David Soria Parra
5dd18fed7a Wrong file 2008-05-18 14:28:19 +00:00
David Soria Parra
3e52aaf16d MFH: Tests from Munich PHP Testfest 2008 2008-05-17 23:29:14 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Derick Rethans
fd73296bf2 - MFH: Fixed bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB). 2007-12-01 17:20:45 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Antony Dovgal
79e53b202c fix ws & folding 2007-07-19 14:32:55 +00:00
Antony Dovgal
1f65545121 fix test names 2007-05-07 18:03:01 +00:00
Derick Rethans
047ccbc0c2 - MFH: Added test case for bug #41252. 2007-05-01 16:04:33 +00:00
Antony Dovgal
bb489851e9 win32 test fixes 2007-04-18 08:06:29 +00:00
Ilia Alshanetsky
ed0f0e4a67 Fixed bug #40999 (mcrypt_create_iv() not using random seed). 2007-04-05 01:48:56 +00:00
Ilia Alshanetsky
b997390e1d use constant 2007-02-15 01:40:36 +00:00
Ilia Alshanetsky
ed6725c695 Improved validation route for size parameter of the mcrypt_create_iv()
function.
2007-02-15 01:15:45 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Derick Rethans
7180422fdc - Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores
--with-libdir).
2006-12-23 17:58:47 +00:00
Ilia Alshanetsky
34b55f2012 Replace non-threadsafe rand() with php_rand_r() 2006-11-28 00:22:05 +00:00
Hannes Magnusson
aaa1d62614 MFH: fix/add SKIPIF 2006-06-27 00:09:43 +00:00
Hannes Magnusson
223d122cae MFH: use the ZEND_ACC_DEPRECATED flag rather than custom warnings 2006-06-26 16:33:39 +00:00
Dmitry Stogov
1dbaae2795 Added automatic module globals management 2006-06-15 18:33:09 +00:00
Antony Dovgal
d5be48711a MFH: add expected warning to the test 2006-05-31 20:40:11 +00:00
Derick Rethans
c116ecf207 - There was nothing wrong here, bug report #37595 is bogus.
- Added a new test case to demonstrate a longer plain text.
2006-05-31 20:09:07 +00:00
Antony Dovgal
47edd8a303 MFH: fix #37595 (mcrypt_generic calculates data length in wrong way) 2006-05-31 12:06:36 +00:00
Marcus Boerger
ac3c882bb6 - Use of E_RECOVERABLE_ERROR 2006-05-11 08:06:22 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
Ilia Alshanetsky
ae07423bcd Fixed bug #35496 (Crash in mcrypt_generic()/mdecrypt_generic() without
proper init).
2005-11-30 23:51:25 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
foobar
a20383ba06 - Unify the "configure --help" texts 2005-05-29 23:17:16 +00:00
foobar
f8a540d105 - Typofix + removed unnecessary unsets caused by it 2005-01-22 01:31:54 +00:00
foobar
69eec3f3b9 MFB_4_3: Quote macro names in AC_DEFUN() 2004-12-30 07:08:39 +00:00
Marcus Boerger
29cfd6d24f - Remove unused blocks 2004-05-19 08:56:50 +00:00
Derick Rethans
abff9671fb - Whitespace 2004-04-18 14:04:48 +00:00
Derick Rethans
a3adb776ad - This define is not used anymore 2004-01-18 19:21:23 +00:00
foobar
f4983c0d3f - Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5 2004-01-17 13:00:38 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too..
# Should the LICENSE and Zend/LICENSE dates be updated too?
2004-01-08 17:33:29 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Derick Rethans
4845b205fc - Test commit 2003-12-19 15:29:34 +00:00
Wez Furlong
0c126e1233 make these build with new win32 build system.
mcve untested (I don't have those libs/headers)
2003-12-19 15:04:31 +00:00
Ilia Alshanetsky
00635d0807 Fixed bug #26042 (memory leak if mcrypt_generic_deinit() is not called
after every mcrypt_generic_init() call).

# This will be MFHed into 4.3.X tree after release.
2003-10-31 04:33:51 +00:00
Derick Rethans
c3b21fc55c - Email address change 2003-10-13 09:33:00 +00:00
foobar
dc080a5db6 - Always look into /usr/local before /usr
- Added breaks to make sure the preferred value is used.
2003-10-01 02:53:23 +00:00
Ilia Alshanetsky
526a3d9ce2 Always prefer user specified paths over the default /usr /usr/local.
This may fix compilation problems with on systems with multiple copies of
the same library.
2003-09-30 22:36:43 +00:00
Ilia Alshanetsky
c23609efa7 Fixed paths in various tests. In certain conditions usage of partial file
paths results in test failures.
2003-08-18 22:57:49 +00:00
Andrey Hristov
b8e59bb336 proto fixes 2003-06-12 12:00:20 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Derick Rethans
bce69f1218 - Whitespace 2003-03-13 21:09:27 +00:00
David Hill
5c90216d2c 64-bit correction to variables passed to zend_parse_parameters
@64-bit correction to variables passed to zend_parse_parameters (Dave)
2003-03-06 23:07:28 +00:00
Edin Kadribasic
6c20fa725e MFB: Enabled mcrypt_generic_deinit() on windows (#22520) 2003-03-03 21:25:25 +00:00
Melvyn Sopacua
f20d394e2d Require 2.5.6+
MFB: Be -ltdl aware
2003-01-31 23:01:36 +00:00
Ilia Alshanetsky
e2868b5788 Removed pointless memory allocation checks. 2003-01-18 19:41:56 +00:00
Ilia Alshanetsky
2d4a4a99d3 Removed unused variable. 2003-01-08 03:33:00 +00:00
Edin Kadribasic
6113d95433 Comment out non ANSI C standard comliant code. Fixes win32 build. 2003-01-06 01:26:14 +00:00
Derick Rethans
4d3c4ab45d - Update todo 2003-01-03 19:50:41 +00:00
Derick Rethans
419af9f12a - Removed support for libmcrypt 2.2.x to allow cleaner code. Another reason
to upgrade libmcrypt to a 2.5.x series as the older ones have too much bugs
  to be safely used with PHP.
- Updated macro's, php_errors and parameter parsing.
@- Removed support for libmcrypt 2.2.x to allow cleaner code. Another reason
@  to upgrade libmcrypt to a 2.5.x series as the older ones have too much bugs
@  to be safely used with PHP. (Derick)
2003-01-03 19:49:44 +00:00
Sebastian Bergmann
b506f5c8f8 Bump year. 2002-12-31 16:08:15 +00:00
Edin Kadribasic
2fc8358e3a MFB: Remove dependancy on libtool library which is no longer needed. 2002-12-19 10:49:05 +00:00
Derick Rethans
1a25797249 - Naming style 2002-10-25 11:20:45 +00:00
Derick Rethans
2af2e62850 - Add the source file too 2002-10-08 10:01:34 +00:00
Derick Rethans
f0c1345cb6 - Add blowfish compatibility test 2002-10-08 10:00:52 +00:00
foobar
e040302807 Remove unnecessary whitespace 2002-08-29 15:28:09 +00:00
Derick Rethans
1d5ab209eb - Unify error messages
#- This is the last one for today... can't really stand another
#  get_active_function_name(TSRMLS_C)  :)
2002-06-26 09:09:35 +00:00
Derick Rethans
7672dbcdcf - Fix version in phpinfo(); 2002-06-16 18:20:21 +00:00
Sterling Hughes
6270efc5a9 remove experimental status 2002-03-23 23:46:04 +00:00
Sterling Hughes
34ba10b98b the point can be made both ways :) 2002-03-23 23:40:19 +00:00
jim winstead
d3400b2b5f the 'setup' script was removed more than two years ago.
these can be safely removed from the 4.2 branch, too.
2002-03-16 00:21:40 +00:00
Sascha Schumann
5cba3a99c2 extension converted automatically to PHP_NEW_EXTENSION. Manually confirmed 2002-03-12 16:44:00 +00:00
Derick Rethans
9354703d9d - Fix mcrypt tests 2002-03-05 08:24:21 +00:00
Yasuo Ohgaki
83059ae3de Use {NULL, NULL, NULL} to terminate function entry.
# It does not fix any bugs, since {0} works also.
2002-02-28 12:10:36 +00:00
Hartmut Holzgraefe
5a8b199454 always quote messages with [...], *especialy* when using kommas in the text 2002-01-04 14:13:53 +00:00
Derick Rethans
08c69a5aac - Fix for bug 14690 2001-12-26 10:01:50 +00:00
Sebastian Bergmann
825198e7f7 Update header. 2001-12-20 17:08:16 +00:00
Colin Viebrock
0222aed97b Add headers and Id lines 2001-12-20 16:50:49 +00:00
Derick Rethans
e51ce799af - Try to be a little bit more sane dealing backwards compability 2001-12-17 20:18:16 +00:00
Derick Rethans
9f6ff716c1 - Added TODO file 2001-12-15 13:18:51 +00:00
Derick Rethans
856c9fa57b - Fix for bug 14162, invalidate the resource then mcrypt_generic_init fails 2001-12-15 13:17:55 +00:00
Derick Rethans
cf8c1ef7b4 - Remove debug stuff 2001-12-13 21:12:53 +00:00
Derick Rethans
0adf145a9f - Fixes for bugs 10324, 12777, 14488 and 13399
@- Fixed several crash bugs in the mcrypt extension (Derick)
2001-12-13 20:44:40 +00:00
Sterling Hughes
c55f8b96c9 MFB 2001-12-13 16:27:39 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
foobar
f1397d5339 Unified the configure messages. 2001-11-30 19:00:13 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first,
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
2001-10-11 23:33:59 +00:00
Jeroen van Wolffelaar
6cfba2a3ea 2nd phase in back-substitution those macro's
I've got pretty much everything now...
2001-09-25 22:49:04 +00:00
Derick Rethans
db1fe4b060 - Don't return from the function, so that mcrypt get properly initialized
(fix for bug #13399)
2001-09-23 14:39:08 +00:00
Derick Rethans
9c610ae87f - Added mcrypt_generic_deinit and added a warning about mcrypt_generic_end
being deprecated.
- Reordened constants, and added MCRYPT_3DES to the 2.4 set of constants
2001-09-23 14:14:27 +00:00
foobar
f78cf8ee67 Moved the check for mcrypt_generic_deinit to the right place. 2001-09-22 17:55:16 +00:00
foobar
6bcd0ae557 Check if mcrypt lib has mcrypt_generic_deinit 2001-09-22 17:51:07 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Sterling Hughes
92390db7e6 MFB 2001-09-07 11:39:00 +00:00
Sterling Hughes
b8cf53d8a5 get rid of global mess 2001-09-07 10:29:06 +00:00
Sterling Hughes
1bc80e6048 register a list destructor 2001-09-07 10:25:26 +00:00
Derick Rethans
2e153ddae1 - Fix for bug #13052 2001-09-07 07:31:39 +00:00
foobar
032b263129 Fixes commit / link problems with certain compilers.
# Please use PHP_CHECK_LIBRARY() always instead of AC_CHECK_LIB
# if you need to pass extra libs/libpaths to the test.
2001-09-05 13:18:09 +00:00
foobar
ace9632276 Make this compile in ZTS mode. 2001-07-30 21:12:48 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
4bbb8a001e Fix a couple of buffer overflows in mcrypt.c 2001-07-10 12:57:28 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Derick Rethans
d1697ad012 - Fix for bug #10890
@- Fixed bugs in the mcrypt extension that caused crashes (Derick)
2001-05-18 20:54:15 +00:00
Derick Rethans
73f04651fa - Fix for bug #9801 (and maybe others) 2001-05-17 21:27:48 +00:00
Sascha Schumann
718b588b14 Fix indentation of ./configure --help messages. 2001-05-12 09:13:42 +00:00
foobar
14e883c3a0 Cleaned up this a bit.. 2001-05-10 00:55:48 +00:00
Derick Rethans
7f20f1e866 - Fix for bug #10518 (Thanks to kettler@gmx.net) 2001-05-01 07:09:09 +00:00
Derick Rethans
f557830af8 - Fixed some more problems with keys being chopped off (fix for bug #8839) 2001-04-18 22:14:06 +00:00
Derick Rethans
a379669ab6 - Removed debug thing 2001-04-10 00:09:17 +00:00
Derick Rethans
61e1bf9286 - Fix for bug #8839
- MINFO updated to use smart_str's
2001-04-10 00:07:53 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +00:00
Derick Rethans
9720ac01fc - Fixed mem leak 2001-03-16 15:59:45 +00:00
Andi Gutmans
a0d3c5a88e - Finally rename modules.h to zend_modules.h for consistency (first try
was 2000-03-11).
- Remove the first_arg_force_ref[]; and friends extern from php.h as they
  are included via zend_API.h
2001-02-26 18:14:50 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Colin Viebrock
707e7bd938 Support for perl-compatible blowfish encryption (in libmcrypt CVS and
versions later than 2.4.8)
2001-01-13 20:55:15 +00:00
Sascha Schumann
60492fa685 Skip mcrypt/gmp tests, if the extensions are not available. 2000-12-24 16:51:04 +00:00
Derick Rethans
ffd0e06b60 - Added test for bug #8040 2000-12-15 15:59:29 +00:00
Derick Rethans
6caa8c37c2 - Added a patch that changed the checking of which version of libmcrypt is
installed (Thanks to: Anil Madhavapeddy <anil@recoil.org>)
2000-12-15 15:35:48 +00:00
Sascha Schumann
781cf450f8 Run through conv_z_macros 2000-11-22 21:40:15 +00:00
Hartmut Holzgraefe
1f6878e912 2nd step towards auto-credits 2000-11-20 10:33:33 +00:00
Nikos Mavroyanopoulos
e5b0945e4c Corrected some checks for errors. 2000-10-25 18:27:55 +00:00
Daniel Beulshausen
7482eb6adc fixed unresolved externals.
# it compiles fine now, and php loads the extension fine
# but there must be definetly something with the paths
# cause mcrypt doesn't want to load any alogrithm
2000-10-02 11:00:54 +00:00
Daniel Beulshausen
97089c0370 major cleanup
# but still doesn't work for me
2000-09-28 20:22:57 +00:00
Derick Rethans
242139d5ac - Fix for bug #6586 2000-09-09 12:24:20 +00:00
Derick Rethans
82115ea039 - Reversed last 'fix'
# Sascha suggested that it must be corrected in wuth mcal
2000-08-21 07:24:55 +00:00
Derick Rethans
45e9e3a9fe - Fix for bug #6263 2000-08-20 17:39:44 +00:00
Derick Rethans
28273dfaa2 - Clearified which version of libmcrypt is enabled
# Request by Olivier Cahagne
2000-08-15 14:58:21 +00:00
Sascha Schumann
78dfa91e1f Move MCLS_FETCH() inside #if HAVE_LIBMCRYPT24. Fixes build against
libmcrypt 2.2.
2000-08-14 19:38:23 +00:00
Sascha Schumann
61a058f538 Remove unnecessary precompiler macros. The failure condition is catched
at configure time.
2000-08-14 19:29:53 +00:00
Sascha Schumann
744dce0da0 Restrict INI entries when compiling against libmcrypt 2.4. 2000-08-14 19:26:09 +00:00
Sascha Schumann
51fe68fd51 Fix check for libmcrypt in non-system library paths.
Fix case where neither libmcrypt 2.4.x and 2.2.x were found.
Fix library order (scope limited to static libraries)
2000-08-14 19:17:16 +00:00
Derick Rethans
20c007b229 - Now using the better way of using INI directives
- Changed some warning/error messages to be more clear
2000-08-13 11:53:04 +00:00
Derick Rethans
bab5db79f6 @ Added support for libmcrypt 2.4.4 2000-08-11 18:45:17 +00:00
Sascha Schumann
79186d4fe9 Read from /dev/u?random until the buffer is filled.
Submitted by: Derick Rethans <d.rethans@jdimedia.nl>
2000-07-25 22:17:20 +00:00
Sascha Schumann
e8101d4f7b Unify use of my email address 2000-07-10 10:09:15 +00:00
Egon Schmid
772e4fa41a Canged back to uppercase. Are all the backslashes on line 69 to 111 really needed? 2000-06-19 22:12:57 +00:00
Egon Schmid
c3cc31c745 No response from Sascha so changed to lowercase. 2000-06-18 20:01:45 +00:00
Egon Schmid
dd43255b27 More protos. 2000-06-18 19:18:30 +00:00
Andi Gutmans
2b0a8049db - Update module project files to include:
- HAVE_MODULE=1
- ZEND_WIN32
- PHP_WIN32
- COMPILE_DL_MODULE
- ZTS=1
2000-06-10 09:00:31 +00:00