Check if ENGINE_cleanup and PKCS7_NO_DUAL_CONTENT exist in OpenSSL build

Author: jordikroon

ext/openssl/openssl.stub.php

@@ -181,12 +181,13 @@
  * @cvalue PKCS7_NOCRL
  */
 const PKCS7_NOCRL = UNKNOWN;
+#ifndef OPENSSL_NO_RMD160
 /**
  * @var int
  * @cvalue PKCS7_NO_DUAL_CONTENT
  */
 const PKCS7_NO_DUAL_CONTENT = UNKNOWN;
-
+#endif
 /**
  * @var int
  * @cvalue CMS_DETACHED

ext/openssl/openssl_arginfo.h

@@ -51,8 +51,10 @@ void php_openssl_backend_shutdown(void)
 	/* prevent accessing locking callback from unloaded extension */
 	CRYPTO_set_locking_callback(NULL);
 
+#ifdef HAVE_ENGINE_CLEANUP
 	/* Free engine list initialized by OPENSSL_config */
 	ENGINE_cleanup();
+#endif
 
 	/* free allocated error strings */
 	ERR_free_strings();

ext/openssl/openssl_backend_v1.c

@@ -383,6 +383,21 @@ AS_VAR_IF([php_cv_func_getifaddrs], [yes],
   [AC_DEFINE([HAVE_GETIFADDRS], [1],
     [Define to 1 if you have the 'getifaddrs' function.])])
 
+dnl Check whether ENGINE_cleanup() exists in the OpenSSL/LibreSSL we build against
+AC_CHECK_HEADERS([openssl/engine.h])
+
+AC_CHECK_FUNCS([ENGINE_cleanup], [], [
+  AC_MSG_CHECKING([for ENGINE_cleanup in libcrypto])
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+      [[#include <openssl/engine.h>]],
+      [[ENGINE_cleanup();]]
+    )],
+    [AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_ENGINE_CLEANUP], [1], [Define if ENGINE_cleanup is available])],
+    [AC_MSG_RESULT([no])]
+  )
+])
+
 dnl
 dnl Setup extension sources
 dnl

ext/standard/config.m4

@@ -19,6 +19,13 @@ ARG_WITH("config-file-scan-dir", "Dir to check for additional php ini files", ""
 AC_DEFINE("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR);
 AC_DEFINE("PHP_USE_PHP_CRYPT_R", 1, "Define to 1 if PHP uses its own crypt_r, and to 0 if using the external crypt library.");
 
+/* Check whether ENGINE_cleanup() exists in the OpenSSL */
+if (CHECK_HEADER_ADD_INCLUDE("openssl/engine.h", "CFLAGS")) {
+    if (CHECK_FUNC_IN_HEADER("openssl/engine.h", "ENGINE_cleanup", null, "CFLAGS")) {
+        AC_DEFINE("HAVE_ENGINE_CLEANUP", 1, "Define to 1 if ENGINE_cleanup is available.");
+    }
+}
+
 CHECK_HEADER_ADD_INCLUDE("timelib_config.h", "CFLAGS_STANDARD", "ext/date/lib");
 
 ADD_FLAG("LIBS_STANDARD", "iphlpapi.lib");