From 0990b6c07283f68d40388d831fff15b19a56d114 Mon Sep 17 00:00:00 2001
From: "Dr. David von Oheimb" <dev@ddvo.net>
Date: Thu, 14 Mar 2024 15:48:03 +0100
Subject: [PATCH] CMakeLists.txt,Makefile_src,cmpossl/libsecutils: make use of
 various_CMake_tweaks in submodules

---
 CMakeLists.txt | 5 ++---
 Makefile_src   | 2 +-
 cmpossl        | 2 +-
 libsecutils    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54d80ef3..bcf29eb7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ endif()
 
 include_directories(
   ${INC_DIR}
-  ${PROJECT_SOURCE_DIR}/libsecutils/include
 )
 if(DEFINED USE_LIBCMP)
   include_directories(SYSTEM ${CMPOSSL_INC_DIR}/cmp)
@@ -82,7 +81,7 @@ add_executable(cmpClient
 
 target_link_libraries(cmpClient
   ${LIBGENCMP_NAME}
-  secutils
+  security-utilities::library
 )
 if(DEFINED USE_LIBCMP)
   target_link_libraries(cmpClient
@@ -142,7 +141,7 @@ if(DEFINED USE_LIBCMP)
   target_link_libraries(${LIBGENCMP_NAME} cmp)
 endif()
 # important: place libcmp before libcrypto such that its contents are preferred
-target_link_libraries(${LIBGENCMP_NAME} ${OPENSSL_LIBRARIES} secutils) # needed for clang/MacOSX
+target_link_libraries(${LIBGENCMP_NAME} OpenSSL::Crypto OpenSSL::SSL security-utilities::library)
 
 set(INC_PUBLIC_HDRS
   ${INC_DIR}/genericCMPClient.h
diff --git a/Makefile_src b/Makefile_src
index c8a78c86..1df75d1c 100644
--- a/Makefile_src
+++ b/Makefile_src
@@ -101,7 +101,7 @@ override CFLAGS += \
 override CFLAGS +=-Wno-c99-extensions -Wno-language-extension-token -Wno-declaration-after-statement \
   -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-shadow # due to libsecutils
 ifeq ($(LPATH),)
-   override CFLAGS += -I$(SECUTILS_DIR)/include
+   override CFLAGS += -I$(SECUTILS_DIR)/src/libsecutils/include
 endif
 ifneq ($(LIBCMP_INC),)
     ifeq ($(DEB_TARGET_ARCH),) # not during Debian packaging
diff --git a/cmpossl b/cmpossl
index d756844e..170a84a6 160000
--- a/cmpossl
+++ b/cmpossl
@@ -1 +1 @@
-Subproject commit d756844e028f840529af05ee7ff66f74140e04c6
+Subproject commit 170a84a606181cfece9acb9c677fdbd18d91db36
diff --git a/libsecutils b/libsecutils
index 66a78e3f..d951b287 160000
--- a/libsecutils
+++ b/libsecutils
@@ -1 +1 @@
-Subproject commit 66a78e3fe20d790ae596fb5a7deae2357d1866fe
+Subproject commit d951b2870672f0840877bd235ad2ff1afd2c456c