(xmlsec-openssl) Fix build if OpenSSL 3.0 doesn't have engines (#829)

lsh123 · Jul 29, 2024 · 1b01b9a · 1b01b9a
1 parent cd9609f
commit 1b01b9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/make-check.yml b/.github/workflows/make-check.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         include:
           - config_flags:
-          - config_flags: --enable-static --enable-static-linking --without-nss --without-gcrypt --without-gnutls
+          - config_flags: --enable-static --enable-static-linking --disable-openssl3-engines --without-nss --without-gcrypt --without-gnutls
           - config_flags: --enable-static --enable-static-linking --enable-ftp --enable-md5 --enable-gost --enable-gost2012 --without-openssl --without-nss --without-gcrypt
     steps:
     - name: install dependencies

diff --git a/src/openssl/app.c b/src/openssl/app.c
@@ -43,10 +43,13 @@
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
 #include <openssl/conf.h>
-#include <openssl/engine.h>
 #include <openssl/x509_vfy.h>
 #include <openssl/x509.h>
 
+#if !defined(OPENSSL_NO_ENGINE) && (!defined(XMLSEC_OPENSSL_API_300) || defined(XMLSEC_OPENSSL3_ENGINES))
+#include <openssl/engine.h>
+#endif /* !defined(OPENSSL_NO_ENGINE) && (!defined(XMLSEC_OPENSSL_API_300) || defined(XMLSEC_OPENSSL3_ENGINES)) */
+
 #ifndef OPENSSL_IS_BORINGSSL
 #include <openssl/ui.h>
 #endif /* OPENSSL_IS_BORINGSSL */