From 19fc5b52f6a43126235250585e4061cb36feb233 Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Wed, 12 Jul 2023 10:51:37 +0200 Subject: [PATCH] Migrate to openssl3 Change-Id: I63814f542357289e8e40807f54902a0cd7dc92b8 --- CMakeLists.txt | 1 + packaging/device-certificate-manager-backend-dummy.spec | 4 ++-- src/dummy-backend/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71c0db0..dfd557d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-std=c++17 -O2 -DNDEBUG") ADD_DEFINITIONS("-Werror") ADD_DEFINITIONS("-Wall") ADD_DEFINITIONS("-Wextra") +ADD_DEFINITIONS("-Wno-deprecated-declarations") SET(CMAKE_POSITION_INDEPENDENT_CODE "True") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") diff --git a/packaging/device-certificate-manager-backend-dummy.spec b/packaging/device-certificate-manager-backend-dummy.spec index 332ba69..8aff4a2 100644 --- a/packaging/device-certificate-manager-backend-dummy.spec +++ b/packaging/device-certificate-manager-backend-dummy.spec @@ -8,9 +8,9 @@ Source0: %{name}-%{version}.tar.gz Source1001: device-certificate-manager-backend.manifest BuildRequires: cmake BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(openssl1.1) +BuildRequires: pkgconfig(openssl3) BuildRequires: pkgconfig(device-certificate-manager-backend) -BuildRequires: openssl1.1 +BuildRequires: openssl3 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires(post): /usr/bin/system-info-tool diff --git a/src/dummy-backend/CMakeLists.txt b/src/dummy-backend/CMakeLists.txt index 12fb5a8..cce8b63 100644 --- a/src/dummy-backend/CMakeLists.txt +++ b/src/dummy-backend/CMakeLists.txt @@ -102,7 +102,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/device_ecdsa_cert.c PKG_CHECK_MODULES(DUMMY_DEPS REQUIRED dlog device-certificate-manager-backend - openssl1.1) + openssl3) INCLUDE_DIRECTORIES(SYSTEM ${DUMMY_DEPS_INCLUDE_DIRS}) LINK_DIRECTORIES(${DUMMY_DEPS_LIBRARY_DIRS}) -- 2.34.1