Merge branch 'PHP-5.6'

diff --cc NEWS
index cb8124dd513921d06df361f1fc24b75dd61753a1,7d4206ee98a3307d1a8eea9ca1a4783d32dc62ac..01b57e8f91736b9c30ede205dbfff0d531cc767f
--- 1/NEWS
--- 2/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 63958ac571f99b96eb28b42d239e225db8b95e9f,de5a7d4c58b60de17e81b4698f6f1700919d6540..4ec4c4f4ed2b99f3ad35c00806082b524e041236
--- 1/ext/openssl/openssl.c
--- 2/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();
        }