diff --git a/DesktopEditor/xmlsec/src/OOXMLVerifier.h b/DesktopEditor/xmlsec/src/OOXMLVerifier.h index 40e2f6cd1b..5e1020cba1 100644 --- a/DesktopEditor/xmlsec/src/OOXMLVerifier.h +++ b/DesktopEditor/xmlsec/src/OOXMLVerifier.h @@ -57,7 +57,10 @@ public: } public: - void Check(); + void Check() + { + + } friend class COOXMLVerifier; }; diff --git a/DesktopEditor/xmlsec/test/windows_list_serts/main.cpp b/DesktopEditor/xmlsec/test/windows_list_serts/main.cpp index 3c1d21b09f..386405cfa8 100644 --- a/DesktopEditor/xmlsec/test/windows_list_serts/main.cpp +++ b/DesktopEditor/xmlsec/test/windows_list_serts/main.cpp @@ -12,17 +12,33 @@ void main(void) //std::wstring sSignId = L"{39B6B9C7-60AD-45A2-9F61-40C74A24042E}"; std::wstring sFolderOOXML = L"D:\\555"; - std::wstring sSignId = L"{9792D33F-AB37-4E5B-A465-481B9465818B}"; - CCertificate oCertificate; - if (!oCertificate.ShowSelectDialog()) - return; + if (false) + { + std::wstring sSignId = L"{9792D33F-AB37-4E5B-A465-481B9465818B}"; - COOXMLSigner oOOXMLSigner(sFolderOOXML, &oCertificate); + CCertificate oCertificate; + if (!oCertificate.ShowSelectDialog()) + return; - oOOXMLSigner.SetGuid(sSignId); - oOOXMLSigner.SetImageValid(NSFile::GetProcessDirectory() + L"/../../../resources/valid.png"); - oOOXMLSigner.SetImageInvalid(NSFile::GetProcessDirectory() + L"/../../../resources/invalid.png"); + COOXMLSigner oOOXMLSigner(sFolderOOXML, &oCertificate); - oOOXMLSigner.Sign(); + oOOXMLSigner.SetGuid(sSignId); + oOOXMLSigner.SetImageValid(NSFile::GetProcessDirectory() + L"/../../../resources/valid.png"); + oOOXMLSigner.SetImageInvalid(NSFile::GetProcessDirectory() + L"/../../../resources/invalid.png"); + + oOOXMLSigner.Sign(); + } + else + { + COOXMLVerifier oVerifier(sFolderOOXML); + + size_t nCount = oVerifier.m_arSignatures.size(); + for (std::vector::iterator i = oVerifier.m_arSignatures.begin(); i != oVerifier.m_arSignatures.end(); i++) + { + COOXMLSignature* pSign = *i; + } + + XML_UNUSED(nCount); + } }