From ba518d7c85bc26e80c269304bb4220f30e1a5cb1 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Mon, 25 May 2020 18:26:26 +0300
Subject: [PATCH] .

---
 DesktopEditor/xmlsec/src/ooxmlsignature.pro    | 17 ++++-------------
 DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp |  2 +-
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/DesktopEditor/xmlsec/src/ooxmlsignature.pro b/DesktopEditor/xmlsec/src/ooxmlsignature.pro
index 0afe6454ca..a8cc46a661 100644
--- a/DesktopEditor/xmlsec/src/ooxmlsignature.pro
+++ b/DesktopEditor/xmlsec/src/ooxmlsignature.pro
@@ -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)
-
-}
diff --git a/DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp b/DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
index 675be30666..fc8d76a7d8 100644
--- a/DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
+++ b/DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp
@@ -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;