Skip to content

Commit

Permalink
Use libxml2/xmsec1 for XAdES signature parsing and validation
Browse files Browse the repository at this point in the history
IB-7948

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma committed Jul 30, 2024
1 parent c7c86b8 commit e396ad0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
8 changes: 2 additions & 6 deletions client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions qdigidoc4.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit e396ad0

Please sign in to comment.