Fixed bug #67707 IV not needed for ECB encryption mode, but it returns a warning

Author: mcq8

NEWS

@@ -18,6 +18,10 @@ PHP                                                                        NEWS
   . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
     (Dmitry Saprykin)
 
+- 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)
 

ext/mcrypt/mcrypt.c

@@ -572,7 +572,9 @@ PHP_FUNCTION(mcrypt_generic_init)
 	memcpy(key_s, key, key_len);
 
 	if (iv_len != 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 > iv_size) {
 			iv_len = iv_size;
 		}

ext/mcrypt/tests/bug67707.phpt

@@ -0,0 +1,10 @@
+--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--