From 93ae45751bd3a4fc7b763a733eb60045fbe4e452 Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Wed, 12 Jul 2023 11:48:55 +0200 Subject: [PATCH] Migrate to openssl3 Change-Id: I182e6fbd67caf91c220ed0d8de435d65c4483b6a --- CMakeLists.txt | 2 ++ packaging/ode.spec | 2 +- server/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93cad22..600ae9e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,8 @@ SET(CMAKE_CXX_FLAGS_RELEASE "${COMPILE_BASE_FLAGS} -O2 -DNDEBUG -std=${CXX_STD} SET(CMAKE_C_FLAGS_CCOV "${COMPILE_BASE_FLAGS} -O0 --coverage") SET(CMAKE_CXX_FLAGS_CCOV "${COMPILE_BASE_FLAGS} -O0 --coverage -std=${CXX_STD} -fno-rtti") +ADD_DEFINITIONS("-Wno-deprecated-declarations") + IF(NOT DEFINED LIB_DIR) SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}") ENDIF(NOT DEFINED LIB_DIR) diff --git a/packaging/ode.spec b/packaging/ode.spec index cb990a4..82c423b 100755 --- a/packaging/ode.spec +++ b/packaging/ode.spec @@ -15,7 +15,7 @@ BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(cynara-client) -BuildRequires: pkgconfig(libcrypto1.1) +BuildRequires: pkgconfig(openssl3) BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(capi-system-device) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 085003a..9b12157 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -46,7 +46,7 @@ SET(DEPENDENCY klay gio-2.0 libtzplatform-config cynara-client - libcrypto1.1 + openssl3 libsmack capi-system-device libsystemd diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 351c3a3..ff70c7e 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -36,7 +36,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${TEST_SRC}) PKG_CHECK_MODULES(TEST_DEPS REQUIRED klay glib-2.0 gio-2.0 - libcrypto1.1 + openssl3 vconf ext2fs com_err -- 2.34.1