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

Commit: 473ccf47a553cd2685d9c99d22a87f00d20345f8 Author: Jakub Zelenka <bukka@php.net> Sun, 6 Sep 2015 16:42:37 +0100 Parents: 97738646610b48316300db91d128dd5661d1b5d2 d47029167dfc2184f9a630a75a55e145bff8b017 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=473ccf47a553cd2685d9c99d22a87f00d20345f8 Log: Merge branch 'PHP-5.6' Changed paths: MM NEWS MM ext/openssl/openssl.c Diff: diff --cc NEWS index cb8124d,7d4206e..01b57e8 --- a/NEWS +++ b/NEWS @@@ -10,8 -14,20 +10,9 @@@ PH encoding). (cmb) - OpenSSL: - . Fixed bug #55259 (openssl extension does not get the DH parameters from - DH key resource). (Jakub Zelenka) . Fixed bug #70395 (Missing ARG_INFO for openssl_seal()). (cmb) + . Fixed bug #60632 (openssl_seal fails with AES). (Jakub Zelenka) -- PDO: - . Fixed bug #70389 (PDO constructor changes unrelated variables). (Laruence) - -- Phpdbg: - . Fix phpdbg_break_next() sometimes not breaking. (Bob) - -- Standard: - . Fixed bug #67131 (setcookie() conditional for empty values not met). (cmb) - - Streams: . Fixed bug #70361 (HTTP stream wrapper doesn't close keep-alive connections). (Niklas Keller) diff --cc ext/openssl/openssl.c index 63958ac,de5a7d4..4ec4c4f --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -4914,9 -4868,13 +4914,13 @@@ PHP_FUNCTION(openssl_seal if (method) { cipher = EVP_get_cipherbyname(method); if (!cipher) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown signature algorithm."); + php_error_docref(NULL, E_WARNING, "Unknown signature algorithm."); RETURN_FALSE; } + if (EVP_CIPHER_iv_length(cipher) > 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Ciphers with modes requiring IV are not supported"); + RETURN_FALSE; + } } else { cipher = EVP_rc4(); }