Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Allow passing $tag for non-authenticated encryption

diff --cc ext/openssl/openssl.c
Simple merge

diff --cc ext/openssl/tests/openssl_decrypt_error.phpt
index 5f79cd86c2e5d51e14e115bb2b7ea74aa4e98325,dfd451fe93fdea9541fabe2d8d78a32c4cf601a6..7564b878ec2c217a25250902458e0174f7dc5f1f
--- 1/ext/openssl/tests/openssl_decrypt_error.phpt
--- 2/ext/openssl/tests/openssl_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_decrypt_error.phpt
@@@ -19,9 -19,10 +19,7 @@@ var_dump(openssl_decrypt($wrong, $metho
  var_dump(openssl_decrypt($wrong, $wrong, $password));
  var_dump(openssl_decrypt($encrypted, $wrong, $wrong));
  var_dump(openssl_decrypt($wrong, $wrong, $wrong));
 -var_dump(openssl_decrypt(array(), $method, $password));
 -var_dump(openssl_decrypt($encrypted, array(), $password));
 -var_dump(openssl_decrypt($encrypted, $method, array()));
  
- // invalid using of an authentication tag
- var_dump(openssl_encrypt($data, $method, $password, 0, $iv, $wrong));
  ?>
  --EXPECTF--
  Warning: openssl_encrypt(): Using an empty Initialization Vector (iv) is potentially insecure and not recommended in %s on line %d
@@@ -41,6 -42,12 +39,3 @@@ bool(false
  
  Warning: openssl_decrypt(): Unknown cipher algorithm in %s on line %d
  bool(false)
--
- Warning: openssl_encrypt(): The authenticated tag cannot be provided for cipher that doesn not support AEAD in %s on line %d
- string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM="
 -Warning: openssl_decrypt() expects parameter 1 to be string, array given in %s on line %d
 -NULL
 -
 -Warning: openssl_decrypt() expects parameter 2 to be string, array given in %s on line %d
 -NULL
 -
 -Warning: openssl_decrypt() expects parameter 3 to be string, array given in %s on line %d
 -NULL

diff --cc ext/openssl/tests/openssl_encrypt_error.phpt
index 0b1bc662f77cc9638a7a7974fcc1a84249d98114,71e679ffffe3f891fc7779a8e434a598124a4b3a..81a5bebff3b6755b229f977c4e8e050fd0bcc772
--- 1/ext/openssl/tests/openssl_encrypt_error.phpt
--- 2/ext/openssl/tests/openssl_encrypt_error.phpt
+++ b/ext/openssl/tests/openssl_encrypt_error.phpt
@@@ -14,10 -14,13 +14,7 @@@ $arr = array(1)
  
  // wrong parameters tests
  var_dump(openssl_encrypt($data, $wrong, $password));
 -var_dump(openssl_encrypt($object, $method, $password));
 -var_dump(openssl_encrypt($data, $object, $password));
 -var_dump(openssl_encrypt($data, $method, $object));
 -var_dump(openssl_encrypt($arr, $method, $object));
 -var_dump(openssl_encrypt($data, $arr, $object));
 -var_dump(openssl_encrypt($data, $method, $arr));
  
- // invalid using of an authentication tag
- var_dump(openssl_encrypt($data, $method, $password, 0, $iv, $wrong));
- 
  // padding of the key is disabled
  var_dump(openssl_encrypt($data, $method, $password, OPENSSL_DONT_ZERO_PAD_KEY, $iv));
  ?>
@@@ -25,8 -28,23 +22,5 @@@
  Warning: openssl_encrypt(): Unknown cipher algorithm in %s on line %d
  bool(false)
  
- Warning: openssl_encrypt(): The authenticated tag cannot be provided for cipher that doesn not support AEAD in %s on line %d
- string(44) "iPR4HulskuaP5Z6me5uImk6BqVyJG73+63tkPauVZYk="
 -Warning: openssl_encrypt() expects parameter 1 to be string, object given in %s on line %d
 -NULL
 -
 -Warning: openssl_encrypt() expects parameter 2 to be string, object given in %s on line %d
 -NULL
 -
 -Warning: openssl_encrypt() expects parameter 3 to be string, object given in %s on line %d
 -NULL
 -
 -Warning: openssl_encrypt() expects parameter 1 to be string, array given in %s on line %d
 -NULL
 -
 -Warning: openssl_encrypt() expects parameter 2 to be string, array given in %s on line %d
 -NULL
 -
 -Warning: openssl_encrypt() expects parameter 3 to be string, array given in %s on line %d
 -NULL
--
 -Warning: openssl_encrypt(): Key length cannot be set for the cipher method in %s on line %d
 +Warning: openssl_encrypt(): Key length cannot be set for the cipher algorithm in %s on line %d
  bool(false)