From b930ad258d99eeba84df19de191d01a56bbbb707 Mon Sep 17 00:00:00 2001
From: Keyi Zhong <kz25@uw.edu>
Date: Tue, 13 Dec 2022 16:47:42 +0800
Subject: [PATCH] mv log module to v2

---
 kae_engine/src/Makefile.am                        |  8 +++-----
 kae_engine/src/e_uadk.c                           | 10 +++++++---
 kae_engine/src/{v1 => }/utils/engine_config.c     |  0
 kae_engine/src/{v1 => }/utils/engine_config.h     |  0
 kae_engine/src/{v1 => }/utils/engine_log.c        |  0
 kae_engine/src/{v1 => }/utils/engine_log.h        |  0
 kae_engine/src/{v1 => }/utils/engine_utils.c      |  0
 kae_engine/src/{v1 => }/utils/engine_utils.h      |  0
 kae_engine/src/v1/alg/ciphers/sec_ciphers.c       |  4 ++--
 kae_engine/src/v1/alg/ciphers/sec_ciphers_soft.c  |  2 +-
 kae_engine/src/v1/alg/ciphers/sec_ciphers_utils.c |  2 +-
 kae_engine/src/v1/alg/ciphers/sec_ciphers_wd.c    |  4 ++--
 kae_engine/src/v1/alg/dh/hpre_dh.c                |  2 +-
 kae_engine/src/v1/alg/dh/hpre_dh_soft.c           |  2 +-
 kae_engine/src/v1/alg/dh/hpre_dh_wd.c             |  2 +-
 kae_engine/src/v1/alg/digests/sec_digests.c       |  4 ++--
 kae_engine/src/v1/alg/digests/sec_digests.h       |  2 +-
 kae_engine/src/v1/alg/digests/sec_digests_soft.c  |  2 +-
 kae_engine/src/v1/alg/digests/sec_digests_wd.c    |  4 ++--
 kae_engine/src/v1/alg/pkey/hpre_rsa.c             |  2 +-
 kae_engine/src/v1/alg/pkey/hpre_rsa.h             |  2 +-
 kae_engine/src/v1/alg/pkey/hpre_rsa_soft.c        |  2 +-
 kae_engine/src/v1/alg/pkey/hpre_rsa_utils.c       |  2 +-
 kae_engine/src/v1/alg/pkey/hpre_wd.c              |  2 +-
 kae_engine/src/v1/async/async_callback.c          |  2 +-
 kae_engine/src/v1/async/async_event.c             |  2 +-
 kae_engine/src/v1/async/async_poll.c              |  4 ++--
 kae_engine/src/v1/async/async_task_queue.c        |  4 ++--
 kae_engine/src/v1/uadk_v1.h                       |  2 +-
 kae_engine/src/v1/utils/engine_check.c            |  4 ++--
 kae_engine/src/v1/utils/engine_fork.c             |  2 +-
 kae_engine/src/v1/wdmngr/wd_alg_queue.c           |  2 +-
 kae_engine/src/v1/wdmngr/wd_alg_queue.h           |  2 +-
 kae_engine/src/v1/wdmngr/wd_queue_memory.c        |  4 ++--
 kae_engine/src/v1/wdmngr/wd_queue_memory.h        |  2 +-
 35 files changed, 45 insertions(+), 43 deletions(-)
 rename kae_engine/src/{v1 => }/utils/engine_config.c (100%)
 rename kae_engine/src/{v1 => }/utils/engine_config.h (100%)
 rename kae_engine/src/{v1 => }/utils/engine_log.c (100%)
 rename kae_engine/src/{v1 => }/utils/engine_log.h (100%)
 rename kae_engine/src/{v1 => }/utils/engine_utils.c (100%)
 rename kae_engine/src/{v1 => }/utils/engine_utils.h (100%)

diff --git a/kae_engine/src/Makefile.am b/kae_engine/src/Makefile.am
index ebe2179..8127d28 100644
--- a/kae_engine/src/Makefile.am
+++ b/kae_engine/src/Makefile.am
@@ -4,7 +4,8 @@ ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES=uadk_engine.la
 
 uadk_engine_la_SOURCES=uadk_utils.c e_uadk.c uadk_cipher.c uadk_digest.c uadk_async.c \
-		uadk_rsa.c uadk_sm2.c uadk_pkey.c uadk_dh.c uadk_ec.c uadk_ecx.c
+		uadk_rsa.c uadk_sm2.c uadk_pkey.c uadk_dh.c uadk_ec.c uadk_ecx.c \
+		utils/engine_log.c utils/engine_config.c utils/engine_utils.c
 uadk_engine_la_LIBADD=-ldl $(WD_LIBS) -lpthread
 uadk_engine_la_LDFLAGS=-module -version-number $(VERSION)
 uadk_engine_la_CFLAGS=$(WD_CFLAGS)
@@ -12,7 +13,7 @@ uadk_engine_la_CFLAGS=$(WD_CFLAGS)
 AUTOMAKE_OPTIONS = subdir-objects
 
 if WD_KAE
-AM_CFLAGS = -DKAE
+uadk_engine_la_CFLAGS += -DKAE
 uadk_engine_la_SOURCES+=v1/alg/ciphers/sec_ciphers.c \
 		 v1/alg/ciphers/sec_ciphers_soft.c \
 		 v1/alg/ciphers/sec_ciphers_utils.c \
@@ -30,11 +31,8 @@ uadk_engine_la_SOURCES+=v1/alg/ciphers/sec_ciphers.c \
 		 v1/wdmngr/wd_alg_queue.c \
 		 v1/wdmngr/wd_queue_memory.c \
 		 v1/utils/engine_check.c \
-		 v1/utils/engine_config.c \
 		 v1/utils/engine_fork.c \
-		 v1/utils/engine_log.c \
 		 v1/utils/engine_opensslerr.c \
-		 v1/utils/engine_utils.c \
 		 v1/async/async_callback.c \
 		 v1/async/async_event.c \
 		 v1/async/async_poll.c \
diff --git a/kae_engine/src/e_uadk.c b/kae_engine/src/e_uadk.c
index 0a9e3e6..b588937 100644
--- a/kae_engine/src/e_uadk.c
+++ b/kae_engine/src/e_uadk.c
@@ -24,6 +24,7 @@
 #include <uadk/wd.h>
 #include "uadk.h"
 #include "uadk_async.h"
+#include "utils/engine_log.h"
 #ifdef KAE
 #include "v1/uadk_v1.h"
 #endif
@@ -206,8 +207,8 @@ static int uadk_destroy(ENGINE *e)
 		hpre_destroy();
 	if (uadk_dh_nosva)
 		hpre_dh_destroy();
-	kae_debug_close_log();
 #endif
+	kae_debug_close_log();
 
 	if (uadk_cipher)
 		uadk_e_destroy_cipher();
@@ -387,20 +388,23 @@ static int bind_fn(ENGINE *e, const char *id)
 		return 0;
 	}
 
-#ifdef KAE
 	kae_debug_init_log();
+#ifdef KAE
 	bind_fn_kae_alg(e);
 
 	if (uadk_cipher_nosva || uadk_digest_nosva || uadk_rsa_nosva ||
 	    uadk_dh_nosva) {
 		async_module_init_v1();
 		pthread_atfork(NULL, NULL, engine_init_child_at_fork_handler_v1);
+		US_INFO("enable nosva");
 	}
 #endif
 	bind_fn_uadk_alg(e);
 
-	if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc)
+	if (uadk_cipher || uadk_digest || uadk_rsa || uadk_dh || uadk_ecc) {
 		pthread_atfork(NULL, NULL, engine_init_child_at_fork_handler);
+		US_INFO("enable sva");
+	}
 
 	ret = ENGINE_set_ctrl_function(e, uadk_engine_ctrl);
 	if (ret != 1) {
diff --git a/kae_engine/src/v1/utils/engine_config.c b/kae_engine/src/utils/engine_config.c
similarity index 100%
rename from kae_engine/src/v1/utils/engine_config.c
rename to kae_engine/src/utils/engine_config.c
diff --git a/kae_engine/src/v1/utils/engine_config.h b/kae_engine/src/utils/engine_config.h
similarity index 100%
rename from kae_engine/src/v1/utils/engine_config.h
rename to kae_engine/src/utils/engine_config.h
diff --git a/kae_engine/src/v1/utils/engine_log.c b/kae_engine/src/utils/engine_log.c
similarity index 100%
rename from kae_engine/src/v1/utils/engine_log.c
rename to kae_engine/src/utils/engine_log.c
diff --git a/kae_engine/src/v1/utils/engine_log.h b/kae_engine/src/utils/engine_log.h
similarity index 100%
rename from kae_engine/src/v1/utils/engine_log.h
rename to kae_engine/src/utils/engine_log.h
diff --git a/kae_engine/src/v1/utils/engine_utils.c b/kae_engine/src/utils/engine_utils.c
similarity index 100%
rename from kae_engine/src/v1/utils/engine_utils.c
rename to kae_engine/src/utils/engine_utils.c
diff --git a/kae_engine/src/v1/utils/engine_utils.h b/kae_engine/src/utils/engine_utils.h
similarity index 100%
rename from kae_engine/src/v1/utils/engine_utils.h
rename to kae_engine/src/utils/engine_utils.h
diff --git a/kae_engine/src/v1/alg/ciphers/sec_ciphers.c b/kae_engine/src/v1/alg/ciphers/sec_ciphers.c
index b4743ed..963e10d 100644
--- a/kae_engine/src/v1/alg/ciphers/sec_ciphers.c
+++ b/kae_engine/src/v1/alg/ciphers/sec_ciphers.c
@@ -29,8 +29,8 @@
 
 #include "../../utils/engine_check.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
-#include "../../utils/engine_utils.h"
+#include "../../../utils/engine_log.h"
+#include "../../../utils/engine_utils.h"
 #include "../../async/async_callback.h"
 #include "../../async/async_event.h"
 #include "../../async/async_task_queue.h"
diff --git a/kae_engine/src/v1/alg/ciphers/sec_ciphers_soft.c b/kae_engine/src/v1/alg/ciphers/sec_ciphers_soft.c
index 71fbb33..9d29179 100644
--- a/kae_engine/src/v1/alg/ciphers/sec_ciphers_soft.c
+++ b/kae_engine/src/v1/alg/ciphers/sec_ciphers_soft.c
@@ -23,7 +23,7 @@
  *
  *****************************************************************************/
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 #include "sec_ciphers_soft.h"
 #include "sec_ciphers.h"
 #include "sec_ciphers_utils.h"
diff --git a/kae_engine/src/v1/alg/ciphers/sec_ciphers_utils.c b/kae_engine/src/v1/alg/ciphers/sec_ciphers_utils.c
index 27631db..07be39b 100644
--- a/kae_engine/src/v1/alg/ciphers/sec_ciphers_utils.c
+++ b/kae_engine/src/v1/alg/ciphers/sec_ciphers_utils.c
@@ -27,7 +27,7 @@
 #include "sec_ciphers_utils.h"
 #include "sec_ciphers_soft.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 int sec_ciphers_get_cipher_mode(int nid)
 {
diff --git a/kae_engine/src/v1/alg/ciphers/sec_ciphers_wd.c b/kae_engine/src/v1/alg/ciphers/sec_ciphers_wd.c
index cd84c54..d3e0f03 100644
--- a/kae_engine/src/v1/alg/ciphers/sec_ciphers_wd.c
+++ b/kae_engine/src/v1/alg/ciphers/sec_ciphers_wd.c
@@ -25,9 +25,9 @@
 #include "sec_ciphers_wd.h"
 #include "sec_ciphers_utils.h"
 #include "../../wdmngr/wd_queue_memory.h"
-#include "../../utils/engine_utils.h"
+#include "../../../utils/engine_utils.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 #define OUTPUT_CACHE_SIZE  (256*1024)
 #define INPUT_CACHE_SIZE   (256*1024)
diff --git a/kae_engine/src/v1/alg/dh/hpre_dh.c b/kae_engine/src/v1/alg/dh/hpre_dh.c
index 5a05970..35a33e7 100644
--- a/kae_engine/src/v1/alg/dh/hpre_dh.c
+++ b/kae_engine/src/v1/alg/dh/hpre_dh.c
@@ -24,7 +24,7 @@
 #include "../../utils/engine_types.h"
 #include "../../utils/engine_opensslerr.h"
 #include "../../async/async_task_queue.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 #define DH768BITS 768
 #define DH1024BITS 1024
diff --git a/kae_engine/src/v1/alg/dh/hpre_dh_soft.c b/kae_engine/src/v1/alg/dh/hpre_dh_soft.c
index 5f7303d..1d9d588 100644
--- a/kae_engine/src/v1/alg/dh/hpre_dh_soft.c
+++ b/kae_engine/src/v1/alg/dh/hpre_dh_soft.c
@@ -18,7 +18,7 @@
 
 #include "hpre_dh_soft.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 static int generate_new_priv_key(const DH *dh, BIGNUM *new_priv_key);
 
diff --git a/kae_engine/src/v1/alg/dh/hpre_dh_wd.c b/kae_engine/src/v1/alg/dh/hpre_dh_wd.c
index 38a3d09..0788c19 100644
--- a/kae_engine/src/v1/alg/dh/hpre_dh_wd.c
+++ b/kae_engine/src/v1/alg/dh/hpre_dh_wd.c
@@ -20,7 +20,7 @@
 #include "hpre_dh_wd.h"
 #include "hpre_dh_util.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 #include "../../async/async_callback.h"
 #include "../../async/async_task_queue.h"
 #include "../../async/async_event.h"
diff --git a/kae_engine/src/v1/alg/digests/sec_digests.c b/kae_engine/src/v1/alg/digests/sec_digests.c
index c7efc30..7236f7e 100644
--- a/kae_engine/src/v1/alg/digests/sec_digests.c
+++ b/kae_engine/src/v1/alg/digests/sec_digests.c
@@ -21,9 +21,9 @@
 #include "sec_digests_wd.h"
 
 #include "../../utils/engine_check.h"
-#include "../../utils/engine_utils.h"
+#include "../../../utils/engine_utils.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 #include "../../async/async_callback.h"
 #include "../../async/async_event.h"
 #include "../../async/async_task_queue.h"
diff --git a/kae_engine/src/v1/alg/digests/sec_digests.h b/kae_engine/src/v1/alg/digests/sec_digests.h
index 4cc00ad..79a147b 100644
--- a/kae_engine/src/v1/alg/digests/sec_digests.h
+++ b/kae_engine/src/v1/alg/digests/sec_digests.h
@@ -24,7 +24,7 @@
 #include <uadk/v1/wd_digest.h>
 #include "../../wdmngr/wd_queue_memory.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_utils.h"
+#include "../../../utils/engine_utils.h"
 
 #define MAX_SEND_TRY_CNTS 50
 
diff --git a/kae_engine/src/v1/alg/digests/sec_digests_soft.c b/kae_engine/src/v1/alg/digests/sec_digests_soft.c
index 8e1c4fd..67979b1 100644
--- a/kae_engine/src/v1/alg/digests/sec_digests_soft.c
+++ b/kae_engine/src/v1/alg/digests/sec_digests_soft.c
@@ -19,7 +19,7 @@
 #include <asm/byteorder.h>
 #include "sec_digests_soft.h"
 #include "../../utils/engine_opensslerr.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 static const EVP_MD *sec_digests_soft_md(uint32_t e_nid)
 {
diff --git a/kae_engine/src/v1/alg/digests/sec_digests_wd.c b/kae_engine/src/v1/alg/digests/sec_digests_wd.c
index 1fb1527..55aceb6 100644
--- a/kae_engine/src/v1/alg/digests/sec_digests_wd.c
+++ b/kae_engine/src/v1/alg/digests/sec_digests_wd.c
@@ -18,9 +18,9 @@
 
 #include "sec_digests_wd.h"
 #include "../../wdmngr/wd_queue_memory.h"
-#include "../../utils/engine_utils.h"
+#include "../../../utils/engine_utils.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 KAE_QUEUE_POOL_HEAD_S *g_sec_digests_qnode_pool;
 static digest_engine_ctx_t *wd_digests_new_engine_ctx(KAE_QUEUE_DATA_NODE_S *q_node, sec_digest_priv_t *md_ctx);
diff --git a/kae_engine/src/v1/alg/pkey/hpre_rsa.c b/kae_engine/src/v1/alg/pkey/hpre_rsa.c
index 6c1d96d..dd73c2e 100644
--- a/kae_engine/src/v1/alg/pkey/hpre_rsa.c
+++ b/kae_engine/src/v1/alg/pkey/hpre_rsa.c
@@ -26,7 +26,7 @@
 #include "hpre_rsa_soft.h"
 #include "../../async/async_poll.h"
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 #include "../dh/hpre_dh.h"
 
 #ifndef OPENSSL_NO_RSA
diff --git a/kae_engine/src/v1/alg/pkey/hpre_rsa.h b/kae_engine/src/v1/alg/pkey/hpre_rsa.h
index 11307c7..853308c 100644
--- a/kae_engine/src/v1/alg/pkey/hpre_rsa.h
+++ b/kae_engine/src/v1/alg/pkey/hpre_rsa.h
@@ -28,7 +28,7 @@
 #include <openssl/bn.h>
 #include <openssl/engine.h>
 
-#include "../../utils/engine_utils.h"
+#include "../../../utils/engine_utils.h"
 #include "../../utils/engine_opensslerr.h"
 
 #define RSA_MIN_MODULUS_BITS    512
diff --git a/kae_engine/src/v1/alg/pkey/hpre_rsa_soft.c b/kae_engine/src/v1/alg/pkey/hpre_rsa_soft.c
index 86b915d..68b598f 100644
--- a/kae_engine/src/v1/alg/pkey/hpre_rsa_soft.c
+++ b/kae_engine/src/v1/alg/pkey/hpre_rsa_soft.c
@@ -18,7 +18,7 @@
 
 #include <openssl/rsa.h>
 #include "hpre_rsa.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 /**
  *   succ: > 0
diff --git a/kae_engine/src/v1/alg/pkey/hpre_rsa_utils.c b/kae_engine/src/v1/alg/pkey/hpre_rsa_utils.c
index 0630b28..94499d9 100644
--- a/kae_engine/src/v1/alg/pkey/hpre_rsa_utils.c
+++ b/kae_engine/src/v1/alg/pkey/hpre_rsa_utils.c
@@ -21,7 +21,7 @@
 #include <openssl/evp.h>
 
 #include "../../utils/engine_types.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 #include "hpre_rsa.h"
 #include "hpre_wd.h"
 #include <uadk/v1/wd_rsa.h>
diff --git a/kae_engine/src/v1/alg/pkey/hpre_wd.c b/kae_engine/src/v1/alg/pkey/hpre_wd.c
index 971f7b2..a94b8f4 100644
--- a/kae_engine/src/v1/alg/pkey/hpre_wd.c
+++ b/kae_engine/src/v1/alg/pkey/hpre_wd.c
@@ -42,7 +42,7 @@
 #include "../../utils/engine_types.h"
 #include "hpre_rsa_utils.h"
 #include "../../utils/engine_check.h"
-#include "../../utils/engine_log.h"
+#include "../../../utils/engine_log.h"
 
 static void hpre_rsa_cb(const void *message, void *tag);
 
diff --git a/kae_engine/src/v1/async/async_callback.c b/kae_engine/src/v1/async/async_callback.c
index d01e82e..4fee462 100644
--- a/kae_engine/src/v1/async/async_callback.c
+++ b/kae_engine/src/v1/async/async_callback.c
@@ -30,7 +30,7 @@
 #include <pthread.h>
 
 #include "async_callback.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_log.h"
 
 #include <openssl/err.h>
 
diff --git a/kae_engine/src/v1/async/async_event.c b/kae_engine/src/v1/async/async_event.c
index 245c269..5dd3ac5 100644
--- a/kae_engine/src/v1/async/async_event.c
+++ b/kae_engine/src/v1/async/async_event.c
@@ -34,7 +34,7 @@
 #include <openssl/err.h>
 
 #include "async_event.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_log.h"
 #include "../../uadk.h"
 
 static void async_fd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, OSSL_ASYNC_FD readfd, void *custom)
diff --git a/kae_engine/src/v1/async/async_poll.c b/kae_engine/src/v1/async/async_poll.c
index 0d75ae3..58cd75c 100644
--- a/kae_engine/src/v1/async/async_poll.c
+++ b/kae_engine/src/v1/async/async_poll.c
@@ -34,9 +34,9 @@
 #include "async_poll.h"
 #include "async_event.h"
 #include "async_task_queue.h"
-#include "../utils/engine_utils.h"
+#include "../../utils/engine_utils.h"
 #include "../utils/engine_check.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_log.h"
 
 #include <openssl/err.h>
 
diff --git a/kae_engine/src/v1/async/async_task_queue.c b/kae_engine/src/v1/async/async_task_queue.c
index 2feea7e..c97f0af 100644
--- a/kae_engine/src/v1/async/async_task_queue.c
+++ b/kae_engine/src/v1/async/async_task_queue.c
@@ -33,8 +33,8 @@
 #include <openssl/err.h>
 
 #include "async_task_queue.h"
-#include "../utils/engine_utils.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_utils.h"
+#include "../../utils/engine_log.h"
 
 #define ASYNC_POLL_TASK_NUM 4096
 
diff --git a/kae_engine/src/v1/uadk_v1.h b/kae_engine/src/v1/uadk_v1.h
index 9ca0a94..2243fd9 100644
--- a/kae_engine/src/v1/uadk_v1.h
+++ b/kae_engine/src/v1/uadk_v1.h
@@ -16,7 +16,7 @@
 #define UADK_V1_H
 #include "async/async_poll.h"
 #include "utils/engine_fork.h"
-#include "utils/engine_log.h"
+#include "../utils/engine_log.h"
 
 extern void sec_ciphers_free_ciphers(void);
 extern int cipher_module_init(void);
diff --git a/kae_engine/src/v1/utils/engine_check.c b/kae_engine/src/v1/utils/engine_check.c
index 949eeb8..df29c0c 100644
--- a/kae_engine/src/v1/utils/engine_check.c
+++ b/kae_engine/src/v1/utils/engine_check.c
@@ -29,8 +29,8 @@
 #include "../alg/pkey/hpre_wd.h"
 #include "../alg/dh/hpre_dh_wd.h"
 #include "engine_check.h"
-#include "engine_utils.h"
-#include "engine_log.h"
+#include "../../utils/engine_utils.h"
+#include "../../utils/engine_log.h"
 
 KAE_CHECK_Q_TASK g_kae_check_q_task = {
 	.init_flag = NOT_INIT,
diff --git a/kae_engine/src/v1/utils/engine_fork.c b/kae_engine/src/v1/utils/engine_fork.c
index 14f4e6e..3e4ca75 100644
--- a/kae_engine/src/v1/utils/engine_fork.c
+++ b/kae_engine/src/v1/utils/engine_fork.c
@@ -27,7 +27,7 @@
 #include "../alg/dh/hpre_dh.h"
 #include "../alg/ciphers/sec_ciphers.h"
 #include "../alg/digests/sec_digests.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_log.h"
 #include "../alg/pkey/hpre_wd.h"
 #include "../alg/dh/hpre_dh_wd.h"
 #include "../alg/ciphers/sec_ciphers_wd.h"
diff --git a/kae_engine/src/v1/wdmngr/wd_alg_queue.c b/kae_engine/src/v1/wdmngr/wd_alg_queue.c
index 5cd33ae..9442bf4 100644
--- a/kae_engine/src/v1/wdmngr/wd_alg_queue.c
+++ b/kae_engine/src/v1/wdmngr/wd_alg_queue.c
@@ -17,7 +17,7 @@
  */
 
 #include "wd_alg_queue.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_log.h"
 
 struct wd_queue *wd_new_queue(int algtype)
 {
diff --git a/kae_engine/src/v1/wdmngr/wd_alg_queue.h b/kae_engine/src/v1/wdmngr/wd_alg_queue.h
index 955eed5..b080cfd 100644
--- a/kae_engine/src/v1/wdmngr/wd_alg_queue.h
+++ b/kae_engine/src/v1/wdmngr/wd_alg_queue.h
@@ -20,7 +20,7 @@
 #define __WD_ALG_QUEUE_H
 
 #include <uadk/v1/wd.h>
-#include "../utils/engine_utils.h"
+#include "../../utils/engine_utils.h"
 
 struct wd_queue *wd_new_queue(int algtype);
 
diff --git a/kae_engine/src/v1/wdmngr/wd_queue_memory.c b/kae_engine/src/v1/wdmngr/wd_queue_memory.c
index e6e7a2c..d20016d 100644
--- a/kae_engine/src/v1/wdmngr/wd_queue_memory.c
+++ b/kae_engine/src/v1/wdmngr/wd_queue_memory.c
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 #include "wd_queue_memory.h"
-#include "../utils/engine_utils.h"
-#include "../utils/engine_log.h"
+#include "../../utils/engine_utils.h"
+#include "../../utils/engine_log.h"
 #include <uadk/v1/wd_bmm.h>
 
 #define MAXBLOCKSIZE   0x90000
diff --git a/kae_engine/src/v1/wdmngr/wd_queue_memory.h b/kae_engine/src/v1/wdmngr/wd_queue_memory.h
index 6eee169..95bd81d 100644
--- a/kae_engine/src/v1/wdmngr/wd_queue_memory.h
+++ b/kae_engine/src/v1/wdmngr/wd_queue_memory.h
@@ -22,7 +22,7 @@
 #include <semaphore.h>
 #include <uadk/v1/wd.h>
 #include "wd_alg_queue.h"
-#include "../utils/engine_utils.h"
+#include "../../utils/engine_utils.h"
 
 #define KAE_QUEUE_POOL_MAX_SIZE    512
 #define CHECK_QUEUE_TIME_SECONDS 5 // seconds
-- 
Gitee