com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/openssl/openssl.c

Commit: 76783a26d207d7a60af7294e371e324a10a82fd4 Author: Jakub Zelenka <bukka@php.net> Sun, 20 Sep 2015 12:38:58 +0100 Parents: b0e5f9eb6c4d03491547fb059165c4393f51e88d dcd569aad680327719d2187f0bea067185f5d4a1 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=76783a26d207d7a60af7294e371e324a10a82fd4 Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index 7d3a3f0,7d55878..818b90e --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -353,20 -349,18 +353,20 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_seal, 0, 0, 4) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(1, sealdata) - ZEND_ARG_INFO(1, ekeys) /* arary */ - ZEND_ARG_INFO(0, pubkeys) /* array */ + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(1, sealdata) + ZEND_ARG_INFO(1, ekeys) /* arary */ + ZEND_ARG_INFO(0, pubkeys) /* array */ ZEND_ARG_INFO(0, method) + ZEND_ARG_INFO(1, iv) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0) - ZEND_ARG_INFO(0, data) - ZEND_ARG_INFO(1, opendata) - ZEND_ARG_INFO(0, ekey) - ZEND_ARG_INFO(0, privkey) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(1, opendata) + ZEND_ARG_INFO(0, ekey) + ZEND_ARG_INFO(0, privkey) + ZEND_ARG_INFO(0, iv) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_get_md_methods, 0, 0, 0)