Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 5628afb7821c · 2021-08-04T18:44:06.000+02:00
* PHP-7.4:
  Fix #81327: Error build openssl extension on php 7.4.22
diff --git a/NEWS b/NEWS
@@ -32,6 +32,9 @@ PHP                                                                        NEWS
   . Fixed bug #81226 (Integer overflow behavior is different with JIT
     enabled). (Dmitry)
 
+- OpenSSL:
+  . Fixed bug #81327 (Error build openssl extension on php 7.4.22). (cmb)
+
 - PDO_ODBC:
   . Fixed bug #81252 (PDO_ODBC doesn't account for SQL_NO_TOTAL). (cmb)
 
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -3236,7 +3236,7 @@ PHP_FUNCTION(openssl_csr_sign)
 		goto cleanup;
 	}
 
-#if PHP_OPENSSL_API_VERSION >= 0x10100
+#if PHP_OPENSSL_API_VERSION >= 0x10100 && !defined (LIBRESSL_VERSION_NUMBER)
 	ASN1_INTEGER_set_int64(X509_get_serialNumber(new_cert), serial);
 #else
 	ASN1_INTEGER_set(X509_get_serialNumber(new_cert), serial);

Original file line number	Diff line number	Diff line change
`@@ -3236,7 +3236,7 @@ PHP_FUNCTION(openssl_csr_sign)`
`3236`	`3236`	`goto cleanup;`
`3237`	`3237`	`}`
`3238`	`3238`
`3239`		`-#if PHP_OPENSSL_API_VERSION >= 0x10100`
	`3239`	`+#if PHP_OPENSSL_API_VERSION >= 0x10100 && !defined (LIBRESSL_VERSION_NUMBER)`
`3240`	`3240`	`ASN1_INTEGER_set_int64(X509_get_serialNumber(new_cert), serial);`
`3241`	`3241`	`#else`
`3242`	`3242`	`ASN1_INTEGER_set(X509_get_serialNumber(new_cert), serial);`