From 1e68baa805d465d846e4c96cdd35eb18c94bdcd2 Mon Sep 17 00:00:00 2001
From: zzh <zhangzhihui42@huawei.com>
Date: Thu, 13 Feb 2025 16:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=B3=BB=E7=BB=9Fopenssl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                 | 10 +++++-----
 build/linux/opengauss/build.sh |  9 ---------
 src/CMakeLists.txt             |  6 ++++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09f420d..3bd8a9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,19 +146,19 @@ set(DMS_OCK_PATH ${PROJECT_SOURCE_DIR}/src/ock)
 set(DMS_FI_PATH ${PROJECT_SOURCE_DIR}/src/fi)
 set(DMS_PARAM_PATH ${PROJECT_SOURCE_DIR}/src/param)
 
-## other dependency include 
+## other dependency include
 set(DMS_SECUREC_INC_PATH        "${CMAKE_CURRENT_SOURCE_DIR}/library/huawei_security/include")
-set(DMS_OPENSSL_PATH            "${CMAKE_CURRENT_SOURCE_DIR}/library/openssl/include")
+set(DMS_OPENSSL_PATH            "/usr/include/openssl")
 set(DMS_CBB_PATH                "${CMAKE_CURRENT_SOURCE_DIR}/library/cbb/include")
 set(ZLIB_INC_PATH               "${CMAKE_CURRENT_SOURCE_DIR}/library/zlib/include/")
-set(LZ4_INC_PATH                "${CMAKE_CURRENT_SOURCE_DIR}/library/lz4/include/")
+set(LZ4_INC_PATH                "/usr/include/lz4")
 
 ## lib
 set(SECUREC_LIB_PATH            "${CMAKE_CURRENT_SOURCE_DIR}/library/huawei_security/lib")
-set(OPENSSL_LIB_PATH            "${CMAKE_CURRENT_SOURCE_DIR}/library/openssl/lib")
+set(OPENSSL_LIB_PATH            "/usr/lib64")
 set(CBB_LIB_PATH                "${CMAKE_CURRENT_SOURCE_DIR}/library/cbb/lib")
 set(ZLIB_PATH                   "${CMAKE_CURRENT_SOURCE_DIR}/library/zlib/lib/")
-set(LZ4_PATH                    "${CMAKE_CURRENT_SOURCE_DIR}/library/lz4/lib/")
+set(LZ4_PATH                    "/usr/lib64/")
 
 ## output path
 set (LIBRARY_OUTPUT_PATH        ${CMAKE_CURRENT_SOURCE_DIR}/output/lib)
diff --git a/build/linux/opengauss/build.sh b/build/linux/opengauss/build.sh
index c1e078c..27ae7cb 100644
--- a/build/linux/opengauss/build.sh
+++ b/build/linux/opengauss/build.sh
@@ -105,30 +105,21 @@ export DMS_LIBRARYS=$(pwd)/../../../library
 
 [ -d "${DMS_LIBRARYS}" ] && rm -rf ${DMS_LIBRARYS}
 mkdir -p $DMS_LIBRARYS/huawei_security
-mkdir -p $DMS_LIBRARYS/openssl
 mkdir -p $DMS_LIBRARYS/zlib
 mkdir -p $DMS_LIBRARYS/cbb
-mkdir -p $DMS_LIBRARYS/lz4
 
 export LIB_PATH=$binarylib_dir/kernel/dependency
 export P_LIB_PATH=$binarylib_dir/kernel/platform
 COPT_LIB_PATH=${binarylib_dir}/kernel/component
 
 cp -r $P_LIB_PATH/Huawei_Secure_C/comm/lib     $DMS_LIBRARYS/huawei_security/lib
-cp -r $LIB_PATH/openssl/comm/lib               $DMS_LIBRARYS/openssl/lib
 cp -r $LIB_PATH/zlib1.2.11/comm/lib            $DMS_LIBRARYS/zlib/lib
-cp -r $LIB_PATH/lz4/comm/lib                   $DMS_LIBRARYS/lz4/lib
 
 cp -r $P_LIB_PATH/Huawei_Secure_C/comm/include    $DMS_LIBRARYS/huawei_security/include
-cp -r $LIB_PATH/openssl/comm/include              $DMS_LIBRARYS/openssl/include
 cp -r $LIB_PATH/zlib1.2.11/comm/include           $DMS_LIBRARYS/zlib/include
-cp -r $LIB_PATH/lz4/comm/include                  $DMS_LIBRARYS/lz4/include
 
 cp -r $COPT_LIB_PATH/cbb/include                  $DMS_LIBRARYS/cbb/include
 cp -r $COPT_LIB_PATH/cbb/lib                      $DMS_LIBRARYS/cbb/lib
-cd $DMS_LIBRARYS/openssl/lib
-cp -r libssl_static.a libssl.a
-cp -r libcrypto_static.a libcrypto.a 
 
 cd $PACKAGE
 if [ "$build_tool"x == "cmake"x ];then
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ca5dbf..9ddc7f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,10 +36,12 @@ set(SRC_DMS_LIST ${COMMON_SRC} ${DCS_SRC} ${DLS_SRC} ${DRC_SRC} ${DMS_SRC} ${RC_
 
 add_library(dms SHARED ${SRC_DMS_LIST})
 
+find_package(OpenSSL REQUIRED)
+
 if (ENABLE_FUZZASAN)
-    target_link_libraries(dms pthread dl rt -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libssl} ${libz} ${lz4} ${3rd_libccb} ${vpp_libipsi_crypto} ${LDS} ${fuzz_lib} -Wl,--no-whole-archive)
+    target_link_libraries(dms pthread dl rt OpenSSL::SSL OpenSSL::Crypto -Wl,--whole-archive ${vpp_libsecurec} ${libz} ${lz4} ${3rd_libccb} ${LDS} ${fuzz_lib} -Wl,--no-whole-archive)
 else()
-    target_link_libraries(dms pthread dl rt -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libssl} ${libz} ${lz4} ${3rd_libccb} ${vpp_libipsi_crypto} ${LDS} -Wl,--no-whole-archive)
+    target_link_libraries(dms pthread dl rt OpenSSL::SSL OpenSSL::Crypto -Wl,--whole-archive ${vpp_libsecurec} ${libz} ${lz4} ${3rd_libccb} ${LDS} -Wl,--no-whole-archive)
 endif(ENABLE_FUZZASAN)
 
 # add patch
-- 
Gitee