Update minimum libdigidocpp version and codesigning timestamp server URL

IB-7900 Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · Aug 26, 2024 · 3bef744 · 3bef744
1 parent 5212d87
commit 3bef744
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ include( GNUInstallDirs )
 include( VersionInfo )
 
 find_package( PKCS11 )
-find_package(LibDigiDocpp 3.17.0 REQUIRED)
+find_package(LibDigiDocpp 4.0.0 REQUIRED)
 find_package( LDAP REQUIRED )
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.12.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,15 @@
+DigiDoc4 version [4.6.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.6.0) release notes
+--------------------------------------
+- Code, Text and translation improvements and updates
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.5.0...v4.6.0)
+
+DigiDoc4 version [4.5.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.5.0) release notes
+--------------------------------------
+- Code, Text and translation improvements and updates
+
+[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.4.0...v4.5.0)
+
 DigiDoc4 version [4.4.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.4.0) release notes
 --------------------------------------
 - Code, Text and translation improvements and updates

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -247,7 +247,7 @@ elseif(WIN32)
 	)
 	if(SIGNCERT)
 		list(APPEND SIGNCMD signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256
-			/du http://installer.id.ee /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256)
+			/du http://installer.id.ee /tr http://timestamp.digicert.com /td SHA256)
 		add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 			COMMAND ${SIGNCMD} "$<$<BOOL:${CROSSSIGNCERT}>:/ph;/ac;${CROSSSIGNCERT}>" $<TARGET_FILE:${PROJECT_NAME}>
 			COMMAND_EXPAND_LISTS
@@ -281,7 +281,7 @@ elseif(WIN32)
 		#Popups GUI
 		#COMMAND MakeCert.exe /n "CN=8BBBE4D8-620A-4884-A12A-72F1A2030D8B" /r /h 0 /eku "1.3.6.1.5.5.7.3.3,1.3.6.1.4.1.311.10.3.13" /m 120 /a sha256 /sv qdigidoc4.pvk qdigidoc4.cer
 		#COMMAND Pvk2Pfx.exe /pvk qdigidoc4.pvk /spc qdigidoc4.cer /pfx qdigidoc4.pfx /f
-		COMMAND signtool.exe sign -f ${CMAKE_SOURCE_DIR}/qdigidoc4.pfx -fd SHA256 -v ${MSI_FILE}.appx
+		#COMMAND signtool.exe sign -f ${CMAKE_SOURCE_DIR}/qdigidoc4.pfx -fd SHA256 -v ${MSI_FILE}.appx
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 	)
 else()

diff --git a/cmake b/cmake
diff --git a/extensions/windows/CMakeLists.txt b/extensions/windows/CMakeLists.txt
@@ -74,12 +74,12 @@ if(SIGNCERT)
     add_custom_command(TARGET EsteidShellExtension POST_BUILD
         COMMAND signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256 /du http://installer.id.ee
             "$<$<BOOL:${CROSSSIGNCERT}>:/ph;/ac;${CROSSSIGNCERT}>"
-            /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 $<TARGET_FILE:EsteidShellExtension>
+            /tr http://timestamp.digicert.com /td SHA256 $<TARGET_FILE:EsteidShellExtension>
         COMMAND_EXPAND_LISTS
     )
     add_custom_command(TARGET msishellext POST_BUILD
         COMMAND signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256 /du http://installer.id.ee
-            /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256
+            /tr http://timestamp.digicert.com /td SHA256
             "${CMAKE_BINARY_DIR}/Digidoc_ShellExt-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}.msi"
     )
 endif()
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
@@ -109,8 +109,6 @@
         <File Name="libcrypto-3$(var.OpenSSLSuffix).dll" />
         <File Name="libssl-3$(var.OpenSSLSuffix).dll" />
         <File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
-        <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
-        <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
         <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
 <?if $(sys.BUILDARCH) != x86 ?>
         <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />
+0 −28		modules/FindPoDoFo.cmake
+0 −40		modules/FindXSD.cmake
+0 −79		modules/FindXmlSecurityC.cmake