From 0155b4d9b523a8186c0badc1fdc1618a98a67a5b 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 ++------
 client/Diagnostics_unix.cpp | 2 +-
 client/Diagnostics_win.cpp  | 2 +-
 qdigidoc4.wxs               | 4 ----
 4 files changed, 4 insertions(+), 12 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/client/Diagnostics_unix.cpp b/client/Diagnostics_unix.cpp
index 74055273f..c3f9354e8 100644
--- a/client/Diagnostics_unix.cpp
+++ b/client/Diagnostics_unix.cpp
@@ -128,7 +128,7 @@ void Diagnostics::run()
 		"digidocpp"
 #else
 		"libdigidocpp1", "qdigidoc4", "firefox-pkcs11-loader", "chrome-token-signing", "web-eid",
-		"libxerces-c3.2", "libxml-security-c20", "libxalan-c111", "libxalan-c112",
+		"libxerces-c3.2", "libxml-security-c20", "libxalan-c111", "libxalan-c112", "libxml2", "libxmlsec1",
 		"openssl", "libpcsclite1", "pcsc-lite", "opensc", "awp"
 #endif
 		}).join(QStringLiteral("<br />")) << "<br /><br />";
diff --git a/client/Diagnostics_win.cpp b/client/Diagnostics_win.cpp
index f5ea20157..9d8b1b761 100644
--- a/client/Diagnostics_win.cpp
+++ b/client/Diagnostics_win.cpp
@@ -153,7 +153,7 @@ void Diagnostics::run()
 		"esteidcm", "esteidcm64", "EstIDMinidriver", "EstIDMinidriver64", "onepin-opensc-pkcs11", "EsteidShellExtension",
 		"esteid-plugin-ie", "esteid-plugin-ie64", "chrome-token-signing.exe", "web-eid.exe",
 		"libcrypto-3", "libssl-3", "libcrypto-3-x64", "libssl-3-x64", "libcrypto-1_1", "libssl-1_1", "libcrypto-1_1-x64", "libssl-1_1-x64",
-		"zlib1", "xerces-c_3_1", "xerces-c_3_2", "xalan-c_1_12", "xalanmessages_1_12", "xsec_1_7", "xsec_2_0", "libxml2",
+		"zlib1", "xerces-c_3_1", "xerces-c_3_2", "xalan-c_1_12", "xalanmessages_1_12", "xsec_1_7", "xsec_2_0", "libxml2", "libxmlsec1",
 		"advapi32", "crypt32", "winscard"};
 	for(const QString &lib: dlls)
 	{
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" />