From c59d940a0e08447be5bc53b64541dbde9819d259 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Thu, 11 Jul 2024 11:01:55 +0300
Subject: [PATCH] Use libxml2/xmsec1 for TSL parsing and validation

IB-7947

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efdf60dc8..a41da29b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ permissions:
 env:
   BUILD_NUMBER: ${{ github.run_number }}
   CMAKE_BUILD_PARALLEL_LEVEL: 4
+  UBUNTU_DEPS: cmake libldap2-dev gettext libpcsclite-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
 jobs:
   macos:
     name: Build on macOS
@@ -63,10 +64,10 @@ jobs:
     steps:
     - name: Install dependencies
       if: matrix.container == '20.04'
-      run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian libflatbuffers-dev zlib1g-dev
+      run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config lintian cmake libldap2-dev gettext libpcsclite-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libflatbuffers-dev zlib1g-dev
     - name: Install dependencies
       if: matrix.container != '20.04'
-      run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools lintian libflatbuffers-dev zlib1g-dev
+      run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config lintian ${UBUNTU_DEPS}
     - name: Checkout
       uses: actions/checkout@v4
       with:
@@ -217,7 +218,7 @@ jobs:
       with:
         submodules: recursive
     - name: Install dependencies
-      run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
+      run: sudo apt update -qq && sudo apt install --no-install-recommends -y ${UBUNTU_DEPS}
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v6
       with:
@@ -261,7 +262,7 @@ jobs:
       with:
         submodules: recursive
     - name: Install dependencies
-      run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
+      run: sudo apt update -qq && sudo apt install --no-install-recommends -y ${UBUNTU_DEPS}
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v6
       with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c402bec71..9d50f9fff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 if(NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/VersionInfo.cmake)
-	message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?")
+    message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?")
 endif()
 project(qdigidoc4 VERSION 4.6.0)
 
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 9d9a4bdcd..eb86c86c3 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -266,6 +266,9 @@ elseif(WIN32)
 		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
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.dll appx
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Assets appx/Assets
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
index d7b257d67..43d1708ef 100644
--- a/qdigidoc4.wxs
+++ b/qdigidoc4.wxs
@@ -101,9 +101,14 @@
         <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" />
         <File Name="digidocpp$(var.qt_suffix).dll" />
         <File Name="digidoc-tool.exe" />
         <File Name="digidocpp.conf" />
+        <Directory Name="schema">
+          <Files Include="$(var.libs_path)\schema\*.xsd" />
+        </Directory>
 <?ifdef var.qt_path ?>
         <File Name="libcrypto-3$(var.OpenSSLSuffix).dll" />
         <File Name="libssl-3$(var.OpenSSLSuffix).dll" />
@@ -123,11 +128,6 @@
         <File Source="$(var.qt_path)\D3DCompiler_47.dll" />
         <File Source="$(var.qt_path)\opengl32sw.dll" />
         <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
-<?endif?>
-        <Directory Name="schema">
-          <Files Include="$(var.libs_path)\schema\*.xsd" />
-        </Directory>
-<?ifdef var.qt_path ?>
         <Directory Name="platforms">
           <File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
         </Directory>