From e396ad07e93ba040260cdd14941a635aabbf1e5a Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 30 Jul 2024 08:52:39 +0300
Subject: [PATCH] Use libxml2/xmsec1 for XAdES signature parsing and validation

IB-7948

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 client/CMakeLists.txt | 8 ++------
 qdigidoc4.wxs         | 4 ----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index eb86c86c3..62bd19eca 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -168,9 +168,9 @@ if( APPLE )
 		COMMAND rm $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/digidocpp.framework/Resources/digidoc-tool
 		COMMAND find $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks -name Headers | xargs rm -rf
 		COMMAND install_name_tool -delete_rpath /Library/Frameworks $<TARGET_FILE:${PROJECT_NAME}>
-		COMMAND ln -sf digidocpp.framework/Libraries/libcrypto.dylib
+		COMMAND ln -sf digidocpp.framework/Libraries/libcrypto.3.dylib
 			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/libcrypto.3.dylib
-		COMMAND ln -sf digidocpp.framework/Libraries/libssl.dylib
+		COMMAND ln -sf digidocpp.framework/Libraries/libssl.3.dylib
 			$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/libssl.3.dylib
 	)
 
@@ -262,10 +262,6 @@ elseif(WIN32)
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libcrypto-3${OPENSSL_SUFFIX}.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libssl-3${OPENSSL_SUFFIX}.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/zlib1.dll appx
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/xerces-c_3_2.dll appx
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/XalanMessages_1_12.dll appx
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/Xalan-C_1_12.dll appx
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/xsec_2_0.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxml2.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1-openssl.dll appx
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
index 43d1708ef..d669a008b 100644
--- a/qdigidoc4.wxs
+++ b/qdigidoc4.wxs
@@ -96,10 +96,6 @@
           </ProgId>
         </Component>
         <File Name="zlib$(var.qt_suffix)1.dll" />
-        <File Name="xerces-c_3_2$(var.qt_suffix).dll" />
-        <File Name="XalanMessages_1_12$(var.qt_suffix).dll" />
-        <File Name="Xalan-C_1_12$(var.qt_suffix).dll" />
-        <File Name="xsec_2_0$(var.qt_suffix).dll" />
         <File Name="libxml2.dll" />
         <File Name="libxmlsec1.dll" />
         <File Name="libxmlsec1-openssl.dll" />