Update OpenSSL to 3.0.15 (#629)

IB-8224

Signed-off-by: Raul Metsma <[email protected]>

.github/workflows/build.yml

@@ -165,7 +165,7 @@ jobs:
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 0f8b6ddf49fa8ae66a7826234e9ba3fda5f46d3c
+        vcpkgGitCommitId: 511d74f695bd45959d12b50b00f1b68f69e8f0b0
         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`]"

CMakeLists.txt

@@ -95,7 +95,7 @@ enable_testing()
 add_subdirectory(src)
 add_subdirectory(examples)
 
-find_package( Boost COMPONENTS unit_test_framework )
+find_package(Boost COMPONENTS unit_test_framework QUIET)
 if(TARGET Boost::unit_test_framework)
     add_subdirectory(test)
 endif()

prepare_osx_build_environment.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-OPENSSL_DIR=openssl-3.0.14
+OPENSSL_DIR=openssl-3.0.15
 LIBXML2_DIR=libxml2-2.12.9
 XMLSEC_DIR=xmlsec1-1.3.5
 ANDROID_NDK=android-ndk-r26d

src/CMakeLists.txt

@@ -1,12 +1,12 @@
-if(NOT MINIZIP_FOUND)
+if(TARGET PkgConfig::MINIZIP)
+    add_library(minizip INTERFACE)
+    target_link_libraries(minizip INTERFACE PkgConfig::MINIZIP)
+else()
     message(STATUS "MiniZip not found; using bundled copy.")
     add_library(minizip STATIC minizip/zip.c minizip/unzip.c minizip/ioapi.c $<$<C_COMPILER_ID:MSVC>:minizip/iowin32.c>)
     target_compile_options(minizip PRIVATE $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-parameter -Wno-unused-value>)
     set_target_properties(minizip PROPERTIES COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT" POSITION_INDEPENDENT_CODE YES)
     target_link_libraries(minizip ZLIB::ZLIB)
-else()
-    add_library(minizip INTERFACE)
-    target_link_libraries(minizip INTERFACE PkgConfig::MINIZIP)
 endif()
 
 configure_file( libdigidocpp.pc.cmake libdigidocpp.pc @ONLY )
@@ -123,7 +123,7 @@ set_property(SOURCE Conf.cpp APPEND PROPERTY COMPILE_DEFINITIONS
 )
 
 set_target_properties(digidocpp PROPERTIES
-    VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
+    VERSION ${PROJECT_VERSION}
     SOVERSION 1
     PUBLIC_HEADER "${PUBLIC_HEADER}"
     RESOURCE ${CMAKE_CURRENT_BINARY_DIR}/digidocpp.conf
@@ -230,7 +230,7 @@ install( TARGETS digidocpp
 
 if(WIN32)
     list(APPEND CRYPTO_HEADER crypto/WinSigner.h)
-    target_compile_options(digidocpp PUBLIC "/guard:cf")
+    target_compile_options(digidocpp_util PUBLIC "/guard:cf")
     target_link_options(digidocpp PUBLIC "/guard:cf")
     target_link_libraries(digidocpp PRIVATE Crypt32 cryptui ncrypt)
     install(FILES $<TARGET_PDB_FILE:digidocpp> $<TARGET_PDB_FILE:digidoc-tool> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)

vcpkg-ports/openssl/portfile.cmake

@@ -11,7 +11,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openssl/openssl
     REF "openssl-${VERSION}"
-    SHA512 ebd70c82ef2b8d882858e26333c27b8975e55cc8a350b646c24505cd6feba1e92d4894026ec6b0cefe6d7dcbedb5799bd72df4114c832efb2616b68ad303f5d1
+    SHA512 d6f10f0f07dfa29d6d3f8a82d32c316a9c1ae3f54ecccfd11be0a5e01402779061c9389207968b3da4a67efd8d19b1695f6a1c45fde0d0f4e7b267a316ddb59c
     PATCHES
         disable-apps.patch
         command-line-length.patch

vcpkg-ports/openssl/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "openssl",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",