Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fixed bug #80368

Author: nikic

NEWS

@@ -20,9 +20,13 @@ PHP                                                                        NEWS
   . Fixed bug #80404 (Incorrect range inference result when division results
     in float). (Nikita)
   . Fixed bug #80377 (Opcache misses executor_globals). (Nikita)
-  . Fixed bug #80433 ( 	Unable to disable the use of the AVX command when using
+  . Fixed bug #80433 (Unable to disable the use of the AVX command when using
     JIT). (Nikita)
 
+- OpenSSL:
+  . Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to
+    lack of OCB support). (Nikita)
+
 - Standard:
   . Fixed bug #80366 (Return Value of zend_fstat() not Checked). (sagpant, cmb)
 

ext/openssl/openssl.c

@@ -6901,7 +6901,8 @@ static void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, c
 	int cipher_mode = EVP_CIPHER_mode(cipher_type);
 	memset(mode, 0, sizeof(struct php_openssl_cipher_mode));
 	switch (cipher_mode) {
-#if PHP_OPENSSL_API_VERSION >= 0x10100
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		/* Note: While OpenSSL 1.1 supports OCB mode, LibreSSL does not support it. */
 		case EVP_CIPH_GCM_MODE:
 		case EVP_CIPH_OCB_MODE:
 		case EVP_CIPH_CCM_MODE: