com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/mcryp t/mcrypt.c

Commit: adbb44537ab571c16c99740c0e1fa4bdc58e1c25 Author: Anatol Belski <ab@php.net> Tue, 11 Mar 2014 15:32:07 +0100 Parents: 78bbfd7fac4e6b605869956ed2dfd93dca6ac22f fd5fbba98cdc800c9f25b6213ed72bd24792ecde Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=adbb44537ab571c16c99740c0e1fa4bdc58e1c25 Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: Use /dev/urandom as the default mcrypt_create_iv() source Add tests for bug #66872 and gmp_[rem]root Fixed mcrypt test case Removed bogus loops restored the old code in 5.4/5 related to bug #66872 Conflicts: ext/mcrypt/mcrypt.c Bugs: https://bugs.php.net/66872 Changed paths: MM ext/mcrypt/mcrypt.c Diff: diff --cc ext/mcrypt/mcrypt.c index f027727,5fc632b..e34ace7 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@@ -380,13 -386,13 +386,13 @@@ static PHP_MINIT_FUNCTION(mcrypt) /* {{ le_mcrypt = zend_register_list_destructors_ex(php_mcrypt_module_dtor, NULL, "mcrypt", module_number); /* modes for mcrypt_??? routines */ - REGISTER_LONG_CONSTANT("MCRYPT_ENCRYPT", 0, CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MCRYPT_DECRYPT", 1, CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MCRYPT_ENCRYPT", 0, CONST_PERSISTENT); + REGISTER_INT_CONSTANT("MCRYPT_DECRYPT", 1, CONST_PERSISTENT); /* sources for mcrypt_create_iv */ - REGISTER_INT_CONSTANT("MCRYPT_DEV_RANDOM", 0, CONST_PERSISTENT); - REGISTER_INT_CONSTANT("MCRYPT_DEV_URANDOM", 1, CONST_PERSISTENT); - REGISTER_INT_CONSTANT("MCRYPT_RAND", 2, CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MCRYPT_DEV_RANDOM", RANDOM, CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MCRYPT_DEV_URANDOM", URANDOM, CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MCRYPT_RAND", RAND, CONST_PERSISTENT); ++ REGISTER_INT_CONSTANT("MCRYPT_DEV_RANDOM", RANDOM, CONST_PERSISTENT); ++ REGISTER_INT_CONSTANT("MCRYPT_DEV_URANDOM", URANDOM, CONST_PERSISTENT); ++ REGISTER_INT_CONSTANT("MCRYPT_RAND", RAND, CONST_PERSISTENT); /* ciphers */ MCRYPT_ENTRY2_2_4(3DES, "tripledes"); @@@ -1397,11 -1393,11 +1397,11 @@@ PHP_FUNCTION(mcrypt_ofb PHP_FUNCTION(mcrypt_create_iv) { char *iv; - php_int_t source = RANDOM; - long source = URANDOM; - long size; - int n = 0; ++ php_int_t source = URANDOM; + php_int_t size; + php_int_t n = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &size, &source) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i|i", &size, &source) == FAILURE) { return; }