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

openssl signing bugs

Browse Source
This commit is contained in:
Oleg Korshul
2017-06-15 11:13:18 +03:00
parent 77f8ab6875
commit b19191b286
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DesktopEditor/xmlsec/src/src/XmlSigner_openssl.cpp
View File

@ -75,6 +75,17 @@ public:
EVP_PKEY_FREE(m_key);
}
protected:
static void string_replace(std::string& text, const std::string& replaceFrom, const std::string& replaceTo)
{
size_t posn = 0;
while (std::string::npos != (posn = text.find(replaceFrom, posn)))
{
text.replace(posn, replaceFrom.length(), replaceTo);
posn += replaceTo.length();
}
}
public:
std::string GetNumber()
{
@ -143,6 +154,7 @@ public:
std::string::size_type nStart = nPos1 + sFindFirst.length();
sReturn = sReturn.substr(nStart, nPos2 - nStart);
}
string_replace(sReturn, "\n", "");
BIO_free(bio);
return sReturn;
@ -278,12 +290,12 @@ public:
int nDigestLen = 0;
NSFile::CBase64Converter::Decode(sXmlSignature.c_str(), (int)sXmlSignature.length(), pDigestValue, nDigestLen);
int n2 = EVP_VerifyUpdate(pCtx, pDigestValue, (size_t)nDigestLen);
int n2 = EVP_VerifyUpdate(pCtx, (BYTE*)sXml.c_str(), (size_t)sXml.length());
n2 = n2;
EVP_PKEY* pubkey = X509_get_pubkey(m_cert);
int n3 = EVP_VerifyFinal(pCtx, (BYTE*)sXml.c_str(), (unsigned int)sXml.length(), pubkey);
int n3 = EVP_VerifyFinal(pCtx, pDigestValue, (unsigned int)nDigestLen, pubkey);
n3 = n3;
EVP_MD_CTX_destroy(pCtx);