Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index 2f749914711d55a3c90f1f1b9806bf2ab28ae7b2,7e0d1ac4325368d69995c8c979dc4d92838db156..48643b5c7c4a3b1b2c3c53e8d3764b3df9891bce
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -16,9 -14,16 +16,13 @@@ PH
  - GD:
    . Fixed bug #73893 (A hidden danger of death cycle in a function of gd). (cmb)
  
 -- FPM:
 -  . 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)
 +  . Fixed bug #73692 (Compile ext/openssl with openssl 1.1.0 on Win). (Anatol)
  
  - PDO_Firebird:
    . Implemented FR #72583 (All data are fetched as strings). (Dorin Marcoci)

diff --cc ext/mcrypt/mcrypt.c
index 658046cf98bf545ec469a62941130358f7c4eee2,c589b40fab5f1a127cc6230b9e888cb026d273de..3a17d6dfa19be0ca366b277692f5b7e76a8c4576
--- 1/ext/mcrypt/mcrypt.c
--- 2/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@@ -571,9 -571,11 +571,11 @@@ PHP_FUNCTION(mcrypt_generic_init
        }
        memcpy(key_s, key, key_len);
  
 -      if (iv_len != iv_size) {
 +      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 > iv_size) {
 +              if (iv_len > (size_t)iv_size) {
                        iv_len = iv_size;
                }
        }

diff --cc ext/mcrypt/tests/bug67707.phpt
index 0000000000000000000000000000000000000000,9ba13ab0acd6393c5aff303ef859a8537fad6af3..928c542aee6e664b63314005d0b0e6e2a168d3bc
mode 000000,100644..100644
--- /dev/null
--- 2/ext/mcrypt/tests/bug67707.phpt
+++ b/ext/mcrypt/tests/bug67707.phpt
@@@ -1,0 -1,10 +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