Merge branch 'PHP-7.0' into PHP-7.1

Author: nikic

NEWS

@@ -16,6 +16,10 @@ PHP                                                                        NEWS
 - GD:
   . Fixed bug #73893 (A hidden danger of death cycle in a function of gd). (cmb)
 
+- MCrypt:
+  . Fixed bug #67707 (IV not needed for ECB encryption mode, but it returns a
+    warning). (Robrecht Plaisier)
+
 - OpenSSL:
   . Fixed bug #71519 (add serial hex to return value array). (xrobau)
   . Fixed bug #73692 (Compile ext/openssl with openssl 1.1.0 on Win). (Anatol)

ext/mcrypt/mcrypt.c

@@ -572,7 +572,9 @@ PHP_FUNCTION(mcrypt_generic_init)
 	memcpy(key_s, key, key_len);
 
 	if (iv_len != (size_t)iv_size) {
-		php_error_docref(NULL, E_WARNING, "Iv size incorrect; supplied length: %zd, needed: %d", iv_len, iv_size);
+		if (mcrypt_enc_mode_has_iv(pm->td)) {
+			php_error_docref(NULL, E_WARNING, "Iv size incorrect; supplied length: %zd, needed: %d", iv_len, iv_size);
+		}
 		if (iv_len > (size_t)iv_size) {
 			iv_len = iv_size;
 		}

ext/mcrypt/tests/bug67707.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #67707 IV not needed for ECB encryption mode, but it returns a warning
+--SKIPIF--
+<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
+--FILE--
+<?php
+$td = mcrypt_module_open('rijndael-256', '', 'ecb', '');
+mcrypt_generic_init($td, 'secret key', NULL);
+?>
+--EXPECTF--
+Deprecated: Function mcrypt_module_open() is deprecated in %s on line %d
+
+Deprecated: Function mcrypt_generic_init() is deprecated in %s on line %d