Fix build with OPENSSL_NO_ENGINE

The ENGINE APIs are deprecated in OpenSSL v3, and Fedora 41 and RHEL 10 no longer ship the openssl/engine.h header by default. This allows the build to succeed as a provider without engine.h present. Signed-off-by: Venkatesh J <venkatesh.j@intel.com> Co-authored-by: Yaakov Selkowitz <yselkowi@redhat.com>

Author: 2 people

e_qat.c

@@ -350,7 +350,7 @@ clock_t clock_id = CLOCK_MONOTONIC_RAW;
 clock_t clock_id = CLOCK_MONOTONIC_PRECISE;
 #endif
 
-#ifndef QAT_BORINGSSL
+#if ! defined(QAT_BORINGSSL) && ! defined(QAT_OPENSSL_PROVIDER)
 const ENGINE_CMD_DEFN qat_cmd_defns[] = {
  {
  QAT_CMD_ENABLE_EXTERNAL_POLLING,
@@ -747,6 +747,7 @@ int qat_engine_finish(ENGINE *e)
  * ENGINE_init
  ******************************************************************************/
 
+#ifndef QAT_OPENSSL_PROVIDER
 int qat_engine_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
 {
  unsigned int retVal = 1;
@@ -1052,6 +1053,7 @@ int qat_engine_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
  }
  return retVal;
 }
+#endif /* QAT_OPENSSL_PROVIDER */
 
 #ifdef ENABLE_QAT_HW_KPT
 EVP_PKEY *qat_engine_load_privkey(ENGINE *e, const char *key_id, UI_METHOD *ui_method, void *callback_data)
@@ -1417,6 +1419,7 @@ int bind_qat(ENGINE *e, const char *id)
  return ret;
 }
 
+#ifndef QAT_OPENSSL_PROVIDER
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 IMPLEMENT_DYNAMIC_BIND_FN(bind_qat)
 IMPLEMENT_DYNAMIC_CHECK_FN()
@@ -1499,4 +1502,5 @@ void ENGINE_unload_qat(void)
  }
 }
 #endif /* QAT_BORINGSSL */
+#endif /* QAT_OPENSSL_PROVIDER */
 #endif

e_qat.h

@@ -46,7 +46,11 @@
 #ifndef E_QAT_H
 # define E_QAT_H
 
-# include <openssl/engine.h>
+# ifndef QAT_OPENSSL_PROVIDER
+# include <openssl/engine.h>
+# endif
+# include <openssl/ec.h>
+# include <openssl/err.h>
 # include <sys/types.h>
 # include <unistd.h>
 # include <string.h>

qat_evp.h

@@ -47,7 +47,6 @@
 # define QAT_EVP_H
 
 
-# include <openssl/engine.h>
 # include <openssl/ossl_typ.h>
 # include "e_qat.h"
 

qat_fips.h

@@ -86,7 +86,6 @@
 # include <openssl/rand.h>
 # include <openssl/sha.h>
 # include <openssl/err.h>
-# include <openssl/engine.h>
 # include <openssl/evp.h>
 # include <openssl/async.h>
 # include <openssl/e_os2.h>

qat_hw_ccm.h

@@ -46,7 +46,10 @@
 #ifndef QAT_HW_CCM_H
 # define QAT_HW_CCM_H
 
-# include <openssl/engine.h>
+# ifndef QAT_OPENSSL_PROVIDER
+# include <openssl/engine.h>
+# endif
+# include <openssl/evp.h>
 
 # include "cpa.h"
 # include "cpa_types.h"

qat_hw_ciphers.h

@@ -48,7 +48,9 @@
 
 # ifdef QAT_HW
 
-# include <openssl/engine.h>
+# ifndef QAT_OPENSSL_PROVIDER
+# include <openssl/engine.h>
+# endif
 # include <openssl/ssl.h>
 # include <openssl/crypto.h>
 # include <openssl/aes.h>

qat_hw_ecx.c

@@ -51,10 +51,11 @@
 #include <signal.h>
 #include <stdarg.h>
 
-#include "openssl/ossl_typ.h"
-#include "openssl/kdf.h"
-#include "openssl/evp.h"
-#include "openssl/ssl.h"
+#include <openssl/ossl_typ.h>
+#include <openssl/kdf.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/ssl.h>
 #include "e_qat.h"
 #include "qat_utils.h"
 #include "qat_hw_asym_common.h"

qat_hw_gcm.h

@@ -46,7 +46,10 @@
 #ifndef QAT_HW_GCM_H
 #define QAT_HW_GCM_H
 
-# include <openssl/engine.h>
+# ifndef QAT_OPENSSL_PROVIDER
+# include <openssl/engine.h>
+# endif
+# include <openssl/evp.h>
 
 # include "cpa.h"
 # include "cpa_types.h"

qat_hw_init.c

@@ -128,6 +128,7 @@ int qat_use_signals(void)
  been initialised then there will be a further check within
  qat_engine_init inside a mutex to prevent a race condition. */
 
+#ifndef QAT_OPENSSL_PROVIDER
  if (unlikely(!engine_inited)) {
  ENGINE* e = ENGINE_by_id(engine_qat_id);
 
@@ -146,6 +147,7 @@ int qat_use_signals(void)
  ENGINE_free(e);
  ENGINE_QAT_PTR_RESET();
  }
+#endif
 
  return qat_use_signals_no_engine_start();
 }
@@ -226,6 +228,7 @@ int get_instance(int inst_type, int mem_type)
 
  unsigned int inst_count = 0;
  thread_local_variables_t * tlv = NULL;
+#ifndef QAT_OPENSSL_PROVIDER
  /* See qat_use_signals() above for more info on why it is safe to
  check engine_inited outside of a mutex in this case. */
  if (unlikely(!engine_inited)) {
@@ -245,6 +248,7 @@ int get_instance(int inst_type, int mem_type)
  ENGINE_free(e);
  ENGINE_QAT_PTR_RESET();
  }
+#endif
 
  tlv = qat_check_create_local_variables();
  if (unlikely(NULL == tlv)) {

qat_hw_sha3.h

@@ -46,7 +46,10 @@
 #ifndef QAT_HW_SHA3_H
 # define QAT_HW_SHA3_H
 
-# include <openssl/engine.h>
+# ifndef QAT_OPENSSL_PROVIDER
+# include <openssl/engine.h>
+# endif
+# include <openssl/evp.h>
 
 # include "cpa.h"
 # include "cpa_types.h"