open-eid · kristelmerilain · Jan 9, 2025 · Dec 3, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -84,7 +84,7 @@ jobs:
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: e2edf52610d2c94d2038fe30b247ea5a26964e1b
+        vcpkgGitCommitId: e4644bd15436d406bba71928d086c809e5c9ca45
         vcpkgJsonGlob: ./vcpkg.json
         runVcpkgInstall: true
       env:
@@ -100,7 +100,6 @@ jobs:
       with:
         name: ${{ matrix.target }}
         path: |
-          build/macos/libdigidocpp*.*
           libdigidocpp*.zip
   fedora:
     name: Build on Fedora ${{ matrix.container }}
@@ -187,7 +186,7 @@ jobs:
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: e2edf52610d2c94d2038fe30b247ea5a26964e1b
+        vcpkgGitCommitId: e4644bd15436d406bba71928d086c809e5c9ca45
         vcpkgJsonGlob: ./vcpkg.json
         runVcpkgInstall: true
         runVcpkgFormatString: "[`install`, `--recurse`, `--clean-after-build`, `--x-install-root`, `$[env.VCPKG_INSTALLED_DIR]`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`, `--x-feature`, `tests`]"

diff --git a/build.ps1 b/build.ps1
@@ -41,7 +41,6 @@ if($swig) {
 }
 if($doxygen) {
   $cmakeext += "-DDOXYGEN_EXECUTABLE=$doxygen"
-  $wixext += "-d", "docLocation=$(Get-Location)/$platform/share/doc/libdigidocpp"
 }
 if($platform -eq "arm64" -and $env:VSCMD_ARG_HOST_ARCH -ne "arm64") {
   $cmakeext += "-DCMAKE_DISABLE_FIND_PACKAGE_Python3=yes"
@@ -74,6 +73,11 @@ if($sign) {
     $vcpkg_installed_platform/$vcpkg_triplet/debug/bin/*.dll
 }
 
+$docLocation = "$(Get-Location)/$platform/share/doc/libdigidocpp"
+if (Test-Path -Path $docLocation -PathType Container) {
+  $wixext += "-d", "docLocation=$docLocation"
+}
+
 & wix build -nologo -arch $platform -out $msi_name $wixext `
   -ext WixToolset.UI.wixext `
   -bv "WixUIBannerBmp=$libdigidocpp/banner.bmp" `

diff --git a/libdigidocpp.wxs b/libdigidocpp.wxs
@@ -21,7 +21,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Package Name="Libdigidocpp $(sys.BUILDARCH)" UpgradeCode="$(var.UpgradeCode)"
-      Language="1033" Version="!(bind.FileVersion.digidocpp)" Manufacturer="RIA" InstallerVersion="500">
+      Language="1033" Version="!(bind.FileVersion.digidocpp)" Manufacturer="RIA">
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
     <Icon Id="ID.ico" SourceFile="$(var.ICON)" />
     <Property Id="ARPPRODUCTICON" Value="ID.ico" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -17,12 +17,6 @@ else()
     set(BUILD_VER 0)
 endif()
 
-add_definitions(
-    -DMAJOR_VER=${PROJECT_VERSION_MAJOR}
-    -DMINOR_VER=${PROJECT_VERSION_MINOR}
-    -DRELEASE_VER=${PROJECT_VERSION_PATCH}
-    -DBUILD_VER=${BUILD_VER}
-)
 set(VERSION ${PROJECT_VERSION}.${BUILD_VER})
 
 configure_file( libdigidocpp.pc.cmake libdigidocpp.pc @ONLY )
@@ -63,14 +57,20 @@ set( CRYPTO_HEADER
 )
 
 add_library(digidocpp_ver INTERFACE)
+target_compile_definitions(digidocpp_ver INTERFACE
+    VERSION_STR="${VERSION}"
+    $<$<PLATFORM_ID:Windows>:VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_VER}>
+    $<$<PLATFORM_ID:Windows>:TARGET_NAME="$<TARGET_PROPERTY:NAME>">
+    $<$<PLATFORM_ID:Windows>:$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:APP>>
+)
 target_sources(digidocpp_ver INTERFACE libdigidocpp.rc)
 
 add_library(digidocpp_util STATIC
     util/File.cpp
     util/log.cpp
 )
 
-target_link_libraries(digidocpp_util PRIVATE $<$<OR:$<PLATFORM_ID:Darwin>,$<PLATFORM_ID:iOS>>:-framework\ CoreFoundation>)
+target_link_libraries(digidocpp_util PUBLIC digidocpp_ver PRIVATE $<$<OR:$<PLATFORM_ID:Darwin>,$<PLATFORM_ID:iOS>>:-framework\ CoreFoundation>)
 
 add_library(digidocpp_priv STATIC
     crypto/Connect.cpp
@@ -149,18 +149,17 @@ set_target_properties(digidocpp PROPERTIES
     MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}
     MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_VER}
     MACOSX_RPATH YES
-    COMPILE_DEFINITIONS TARGET_NAME="$<TARGET_NAME:digidocpp>"
     POSITION_INDEPENDENT_CODE YES
 )
 
 target_include_directories(digidocpp
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
     PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
 )
-target_link_libraries(digidocpp PRIVATE ${CMAKE_DL_LIBS} minizip digidocpp_priv digidocpp_ver)
+target_link_libraries(digidocpp PRIVATE ${CMAKE_DL_LIBS} minizip digidocpp_priv)
 
 if( BUILD_TOOLS )
-    add_executable(digidoc-tool digidoc-tool.rc digidoc-tool.cpp)
+    add_executable(digidoc-tool digidoc-tool.cpp)
     target_link_libraries(digidoc-tool digidocpp digidocpp_priv Threads::Threads)
     configure_file( digidoc-tool.1.cmake digidoc-tool.1 )
 endif()
@@ -181,8 +180,7 @@ if(SWIG_FOUND)
         set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/java)
         swig_add_library(digidoc_java LANGUAGE java SOURCES ../libdigidocpp.i)
         target_include_directories(digidoc_java PRIVATE ${JAVA_INCLUDE_PATH} $<$<BOOL:${JAVA_INCLUDE_PATH2}>:${JAVA_INCLUDE_PATH2}>)
-        target_compile_definitions(digidoc_java PRIVATE TARGET_NAME="$<TARGET_NAME:digidoc_java>")
-        target_link_libraries(digidoc_java digidocpp digidocpp_util digidocpp_ver)
+        target_link_libraries(digidoc_java digidocpp digidocpp_util)
         set_target_properties(digidoc_java PROPERTIES
             INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:/Library/Frameworks>
             SWIG_COMPILE_DEFINITIONS $<$<PLATFORM_ID:Windows>:SWIGWIN>
@@ -197,8 +195,7 @@ if(SWIG_FOUND)
         set(CMAKE_SWIG_FLAGS -py3)
         set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
         swig_add_library(digidoc_python LANGUAGE python SOURCES ../libdigidocpp.i)
-        target_compile_definitions(digidoc_python PRIVATE TARGET_NAME="$<TARGET_NAME:digidoc_python>")
-        target_link_libraries(digidoc_python digidocpp digidocpp_util digidocpp_ver)
+        target_link_libraries(digidoc_python digidocpp digidocpp_util)
         if(TARGET Python3::SABIModule)
             target_compile_definitions(digidoc_python PRIVATE Py_LIMITED_API=0x03090000)
             target_link_libraries(digidoc_python Python3::SABIModule)
@@ -225,8 +222,7 @@ if(SWIG_FOUND)
     set(CMAKE_SWIG_FLAGS -namespace digidoc)
     set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/csharp)
     swig_add_library(digidoc_csharp LANGUAGE csharp SOURCES ../libdigidocpp.i)
-    target_compile_definitions(digidoc_csharp PRIVATE TARGET_NAME="$<TARGET_NAME:digidoc_csharp>")
-    target_link_libraries(digidoc_csharp digidocpp digidocpp_util digidocpp_ver)
+    target_link_libraries(digidoc_csharp digidocpp digidocpp_util)
     set_target_properties(digidoc_csharp PROPERTIES
         SWIG_COMPILE_DEFINITIONS $<$<PLATFORM_ID:Windows>:SWIGWIN>
         INSTALL_RPATH $<$<PLATFORM_ID:Darwin>:/Library/Frameworks>

diff --git a/src/Container.cpp b/src/Container.cpp
@@ -73,7 +73,7 @@ string digidoc::userAgent() { return m_userAgent; }
  * Returns libdigidocpp library version
  */
 string digidoc::version() {
-    return FILE_VER_STR;
+    return VERSION_STR;
 }
 
 /**
@@ -121,7 +121,7 @@ void digidoc::initialize(const string &appInfo, const string &userAgent, initCal
 
     INFO("Libxml2 version: %s", LIBXML_DOTTED_VERSION);
     INFO("Xmlsec1 version: %s", XMLSEC_VERSION);
-    INFO("digidocpp version: %s", FILE_VER_STR);
+    INFO("digidocpp version: %s", VERSION_STR);
 
     if(!Conf::instance())
         Conf::init(new XmlConfCurrent);

diff --git a/src/SignatureXAdES_LT.cpp b/src/SignatureXAdES_LT.cpp
@@ -112,12 +112,12 @@ void SignatureXAdES_LT::validate(const string &policy) const
     try {
         auto revocationValues = unsignedSignatureProperties()/"RevocationValues";
         if(!revocationValues)
-            THROW_MAIN(exception, "RevocationValues object is missing")
+            THROW("RevocationValues object is missing");
         if(revocationValues + 1)
-            THROW_MAIN(exception, "More than one RevocationValues object is not supported")
+            THROW("More than one RevocationValues object is not supported");
         auto ocspValues = revocationValues/"OCSPValues";
         if(!ocspValues)
-            THROW_MAIN(exception, "OCSPValues is missing")
+            THROW("OCSPValues is missing");
 
         /*
          * Find OCSP response that matches with signingCertificate.

diff --git a/src/crypto/Connect.cpp b/src/crypto/Connect.cpp
@@ -197,7 +197,7 @@ Connect::Connect(const string &_url, string _method, int _timeout, const vector<
     else
         addHeader("Host", host + ':' + port);
     if(const auto &agent = userAgentData.empty() ? userAgent() : userAgentData; !agent.empty())
-        addHeader("User-Agent", "LIB libdigidocpp/" FILE_VER_STR " (" TARGET_ARCH ") APP " + agent);
+        addHeader("User-Agent", "LIB libdigidocpp/" VERSION_STR " (" TARGET_ARCH ") APP " + agent);
     if(usessl == 0)
         sendProxyAuth();
 }

diff --git a/src/digidoc-tool.cpp b/src/digidoc-tool.cpp
@@ -995,13 +995,13 @@ static int tslcmd(int /*argc*/, char* /*argv*/[])
 int main(int argc, char *argv[]) try
 {
     printf("Version\n");
-    printf("  digidoc-tool version: %s\n", FILE_VER_STR);
+    printf("  digidoc-tool version: %s\n", VERSION_STR);
     printf("  libdigidocpp version: %s\n", version().c_str());
 
     ToolConfig *conf = nullptr;
     Conf::init(conf = new ToolConfig(argc, argv));
     stringstream info;
-    info << "digidoc-tool/" << FILE_VER_STR << " (";
+    info << "digidoc-tool/" << VERSION_STR << " (";
 #ifdef _WIN32
     info << "Windows";
 #elif __APPLE__

diff --git a/src/digidoc-tool.rc b/src/digidoc-tool.rc
diff --git a/src/libdigidocpp.rc b/src/libdigidocpp.rc
@@ -1,19 +1,20 @@
 #include <winver.h>
 
-#define VER_STR_HELPER(x)	#x
-#define VER_STR(x)		VER_STR_HELPER(x)
-
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION MAJOR_VER,MINOR_VER,RELEASE_VER,BUILD_VER
-  PRODUCTVERSION MAJOR_VER,MINOR_VER,RELEASE_VER,BUILD_VER
+  FILEVERSION VERSION
+  PRODUCTVERSION VERSION
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS VS_FF_DEBUG
 #else
   FILEFLAGS 0x0L
 #endif
   FILEOS VOS_NT_WINDOWS32
+#ifdef APP
+  FILETYPE VFT_APP
+#else
   FILETYPE VFT_DLL
+#endif
   FILESUBTYPE VFT_UNKNOWN
 BEGIN
 	BLOCK "StringFileInfo"
@@ -22,12 +23,16 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "RIA"
 			VALUE "FileDescription", TARGET_NAME
-			VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
+			VALUE "FileVersion", VERSION_STR
 			VALUE "InternalName", TARGET_NAME
 			VALUE "LegalCopyright", "(C) 2009-2024 Estonian Information System Authority"
+#ifdef APP
+			VALUE "OriginalFilename", TARGET_NAME ".exe"
+#else
 			VALUE "OriginalFilename", TARGET_NAME ".dll"
+#endif
 			VALUE "ProductName", TARGET_NAME
-			VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
+			VALUE "ProductVersion", VERSION_STR
 		END
 	END
 	BLOCK "VarFileInfo"

diff --git a/src/util/log.cpp b/src/util/log.cpp
@@ -105,7 +105,7 @@ void Log::out(LogType type, const char *file, unsigned int line, const char *for
     va_end(args);
 }
 
-void Log::dbgPrintfMemImpl(const char *msg, const void *ptr, size_t size, const char *file, int line)
+void Log::dbgPrintfMemImpl(const char *msg, const unsigned char *data, size_t size, const char *file, int line)
 {
     Conf *conf = Conf::instance();
     if(!conf || conf->logLevel() < DebugType)
@@ -119,7 +119,6 @@ void Log::dbgPrintfMemImpl(const char *msg, const void *ptr, size_t size, const
         o = &f;
     }
 
-    const unsigned char *data = (const unsigned char*)ptr;
     *o << "DEBUG [" << File::fileName(file) << ':' << line << "] - " << msg << " { ";
     *o << hex << uppercase << setfill('0');
     for(size_t i = 0; i < size; ++i)

diff --git a/src/util/log.h b/src/util/log.h
@@ -38,7 +38,7 @@ namespace digidoc
 
         static std::string format(const char *fmt, ...);
         static void out(LogType type, const char *file, unsigned int line, const char *format, ...);
-        static void dbgPrintfMemImpl(const char *msg, const void *ptr, size_t size, const char *file, int line);
+        static void dbgPrintfMemImpl(const char *msg, const unsigned char *data, size_t size, const char *file, int line);
         static std::string formatArgList(const char *fmt, va_list args);
     };
 }
@@ -49,12 +49,7 @@ namespace digidoc
 #define DEBUG(...) digidoc::Log::out(digidoc::Log::DebugType, __FILE__, __LINE__, __VA_ARGS__)
 #define DEBUGMEM(msg, ptr, size) digidoc::Log::dbgPrintfMemImpl(msg, ptr, size, __FILE__, __LINE__)
 
-#define VER_STR_HELPER(x)	#x
-#define VER_STR(x)		VER_STR_HELPER(x)
-#define FILE_VER_STR	VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
-
 #define EXCEPTION_PARAMS(...) __FILE__, __LINE__, digidoc::Log::format(__VA_ARGS__)
 #define EXCEPTION_ADD(_main, ...) _main.addCause(digidoc::Exception(EXCEPTION_PARAMS(__VA_ARGS__)))
 #define THROW(...) throw digidoc::Exception(EXCEPTION_PARAMS(__VA_ARGS__))
 #define THROW_CAUSE(_cause, ...) throw digidoc::Exception(EXCEPTION_PARAMS(__VA_ARGS__), _cause)
-#define THROW_MAIN(_main, ...) { EXCEPTION_ADD(_main, __VA_ARGS__); throw _main; }
diff --git a/vcpkg.json b/vcpkg.json
@@ -12,7 +12,7 @@
     "features": {
       "tests": { "description": "Build tests", "dependencies": ["boost-test"] }
     },
-    "builtin-baseline": "e2edf52610d2c94d2038fe30b247ea5a26964e1b",
+    "builtin-baseline": "e4644bd15436d406bba71928d086c809e5c9ca45",
     "vcpkg-configuration": {
         "overlay-triplets": ["./vcpkg-triplets"],
         "overlay-ports": [