pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Oleg Korshul
2020-05-25 18:26:26 +03:00
parent a045f57430
commit ba518d7c85
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DesktopEditor/xmlsec/src/ooxmlsignature.pro
View File

@ -19,14 +19,6 @@ include($$CORE_ROOT_DIR/Common/base.pri)
ADD_DEPENDENCY(kernel)
DEFINES -= UNICODE
core_linux {
CONFIG += signature_openssl
}
core_mac {
CONFIG += signature_openssl
}
HEADERS += \
include/XmlCertificate.h \
include/OOXMLSigner.h \
@ -51,10 +43,12 @@ HEADERS += \
LIBS += -lcrypt32
LIBS += -lcryptui
LIBS += -lAdvapi32
LIBS += -lws2_32
LIBS += -lUser32
}
signature_openssl {
!core_windows {
HEADERS += \
src/XmlSigner_openssl.h
@ -64,8 +58,5 @@ SOURCES += \
}
signature_openssl {
CONFIG += open_ssl_common
include(../../../Common/3dParty/openssl/openssl.pri)
}

2
DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
View File

@ -616,7 +616,7 @@ public:
void RemoveSignature(const std::string& sGuid)
{
int nCountSignatures = m_arSignatures.size();
int nCountSignatures = (int)m_arSignatures.size();
if (0 == nCountSignatures)
return;