cvs: php-src(PHP_5_3) /ext/mcrypt mcrypt.c /ext/mcrypt/tests mcrypt_enc_self_test.phpt

dsp Sun May 18 17:08:56 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mcrypt mcrypt.c /php-src/ext/mcrypt/tests mcrypt_enc_self_test.phpt Log: Make mcrypt_enc_self_test() return value compatible with documentation and mcrypt _module_self_test() http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.11.2.3&r2=1.91.2.3.2.11.2.4&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.3 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.4 --- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.11.2.3 Mon Dec 31 07:17:10 2007 +++ php-src/ext/mcrypt/mcrypt.c Sun May 18 17:08:56 2008 @@ -16,7 +16,7 @@ | Derick Rethans <derick@derickrethans.nl> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.3 2007/12/31 07:17:10 sebastian Exp $ */ +/* $Id: mcrypt.c,v 1.91.2.3.2.11.2.4 2008/05/18 17:08:56 dsp Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -589,7 +589,12 @@ PHP_FUNCTION(mcrypt_enc_self_test) { MCRYPT_GET_TD_ARG - RETURN_LONG(mcrypt_enc_self_test(pm->td)); + + if (mcrypt_enc_self_test(pm->td) == 0) { + RETURN_TRUE; + } else { + RETURN_FALSE; + } } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt diff -u php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.2 php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.3 --- php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt:1.1.2.2 Sat May 17 23:29:14 2008 +++ php-src/ext/mcrypt/tests/mcrypt_enc_self_test.phpt Sun May 18 17:08:56 2008 @@ -7,4 +7,4 @@ $td = mcrypt_module_open(MCRYPT_RIJNDAEL_256, '', MCRYPT_MODE_CBC, ''); var_dump(mcrypt_enc_self_test($td)); --EXPECT-- -int(0) \ No newline at end of file +bool(true)