From: Jakub Zelenka <bukka@php.net>
Date: Sun, 6 Sep 2015 15:42:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.0alpha1~1236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=473ccf47a553cd2685d9c99d22a87f00d20345f8;p=php

Merge branch 'PHP-5.6'
---

473ccf47a553cd2685d9c99d22a87f00d20345f8
diff --cc NEWS
index cb8124dd51,7d4206ee98..01b57e8f91
--- 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 63958ac571,de5a7d4c58..4ec4c4f4ed
--- 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();
  	}