pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

realize VerifyPKCS7

Browse Source
This commit is contained in:
Kulikova Svetlana
2023-04-27 17:43:11 +03:00
parent 9fa57133ad
commit 1d864d7f37
6 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/xmlsec/src/include/Certificate.h
View File

@ -53,6 +53,8 @@ public:
virtual std::string Sign(const std::string& sXml) = 0;
virtual bool SignPKCS7(unsigned char* pData, unsigned int nSize,
unsigned char*& pDataDst, unsigned int& nSizeDst) = 0;
virtual int VerifyPKCS7(unsigned char* pPKCS7Data, unsigned int nPKCS7Size,
unsigned char* pData, unsigned int nSize) = 0;
virtual std::string GetHash(unsigned char* pData, unsigned int nSize, int nAlg) = 0;
virtual std::string GetHash(const std::string& sXml, int nAlg) = 0;

6
DesktopEditor/xmlsec/src/src/Certificate_mscrypto.h
View File

@ -468,6 +468,12 @@ public:
return false;
}
virtual int VerifyPKCS7(unsigned char* pPKCS7Data, unsigned int nPKCS7Size,
unsigned char* pData, unsigned int nSize)
{
return 0;
}
virtual std::string GetHash(unsigned char* pData, unsigned int nSize, int nAlgS)
{
if (nAlgS == OOXML_HASH_ALG_INVALID)

6
DesktopEditor/xmlsec/src/src/Certificate_oform.h
View File

@ -101,6 +101,12 @@ public:
return false;
}
virtual int VerifyPKCS7(unsigned char* pPKCS7Data, unsigned int nPKCS7Size,
unsigned char* pData, unsigned int nSize)
{
return 0;
}
virtual std::string GetHash(unsigned char* pData, unsigned int nSize, int nAlg)
{
unsigned int nBufLen = 64;

41
DesktopEditor/xmlsec/src/src/Certificate_openssl.h
View File

@ -397,6 +397,47 @@ public:
return true;
}
virtual int VerifyPKCS7(unsigned char* pPKCS7Data, unsigned int nPKCS7Size,
unsigned char* pData, unsigned int nSize)
{
int nRes = 0;
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();
BIO* outputbio = BIO_new(BIO_s_mem());
BIO_write(outputbio, pPKCS7Data, nPKCS7Size);
PKCS7* pkcs7 = d2i_PKCS7_bio(outputbio, NULL);
BIO_free(outputbio);
if (pkcs7 == NULL)
return nRes;
BIO* inputbio = BIO_new(BIO_s_mem());
BIO_write(inputbio, pData, nSize);
X509_STORE* store = X509_STORE_new();
X509_STORE_add_cert(store, m_cert);
STACK_OF(X509)* signers = sk_X509_new_null();
if (PKCS7_verify(pkcs7, signers, store, inputbio, NULL, PKCS7_NOCHAIN | PKCS7_NOSIGS) == 1)
{
nRes |= (1 << 0);
nRes |= (1 << 1);
}
else if (PKCS7_verify(pkcs7, signers, store, inputbio, NULL, PKCS7_NOCHAIN | PKCS7_NOSIGS | PKCS7_NOVERIFY) == 1)
{
nRes |= (1 << 0);
}
BIO_free(inputbio);
PKCS7_free(pkcs7);
X509_STORE_free(store);
sk_X509_pop_free(signers, X509_free);
EVP_cleanup();
return nRes;
}
virtual std::string GetHash(unsigned char* pData, unsigned int nSize, int nAlg)
{
int nBufLen = 0;

1
PdfFile/PdfFile.cpp
View File

@ -842,7 +842,6 @@ BYTE* CPdfFile::GetButtonIcon(int nRasterW, int nRasterH, int nBackgroundColor,
return m_pInternal->pReader->GetButtonIcon(nRasterW, nRasterH, nBackgroundColor, nPageIndex, nButtonWidget, sIconView);
}
// ------------------------------------------------------------------------
void CPdfFile::CreatePdf(bool isPDFA)

67
PdfFile/PdfReader.cpp
View File

@ -1924,76 +1924,33 @@ BYTE* CPdfReader::VerifySign(const std::wstring& sFile, ICertificate* pCertifica
}
oObj1.free();
DWORD dwLenDataForSignature = 0;
DWORD dwLenDataForVerify = 0;
for (int j = 0; j < arrByteLength.size(); ++j)
dwLenDataForSignature += arrByteLength[j];
BYTE* pDataForSignature = new BYTE[dwLenDataForSignature];
dwLenDataForVerify += arrByteLength[j];
BYTE* pDataForVerify = new BYTE[dwLenDataForVerify];
int nByteOffset = 0;
for (int j = 0; j < arrByteOffset.size(); ++j)
{
std::memcpy(pDataForSignature + nByteOffset, pFileData + arrByteOffset[j], arrByteLength[j]);
std::memcpy(pDataForVerify + nByteOffset, pFileData + arrByteOffset[j], arrByteLength[j]);
nByteOffset += arrByteLength[j];
}
BYTE* pDatatoWrite;
unsigned int dwLenDatatoWrite;
pCertificate->SignPKCS7(pDataForSignature, dwLenDataForSignature, pDatatoWrite, dwLenDatatoWrite);
RELEASEARRAYOBJECTS(pDataForSignature);
if (!pDatatoWrite)
continue;
BYTE* pPKCS7Data = NULL;
DWORD nPKCS7Size = 0;
if (oObj.dictLookup("Contents", &oObj1)->isString())
{
GString* sContents = oObj1.getString();
if (dwLenDatatoWrite > sContents->getLength())
{
oObj1.free();
RELEASEARRAYOBJECTS(pDatatoWrite);
continue;
}
const char* c_pHexStrings[] =
{
"00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0A", "0B", "0C", "0D", "0E", "0F",
"10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1A", "1B", "1C", "1D", "1E", "1F",
"20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2A", "2B", "2C", "2D", "2E", "2F",
"30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3A", "3B", "3C", "3D", "3E", "3F",
"40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4A", "4B", "4C", "4D", "4E", "4F",
"50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5A", "5B", "5C", "5D", "5E", "5F",
"60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6A", "6B", "6C", "6D", "6E", "6F",
"70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7A", "7B", "7C", "7D", "7E", "7F",
"80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8A", "8B", "8C", "8D", "8E", "8F",
"90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9A", "9B", "9C", "9D", "9E", "9F",
"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "AA", "AB", "AC", "AD", "AE", "AF",
"B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "BA", "BB", "BC", "BD", "BE", "BF",
"C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "CA", "CB", "CC", "CD", "CE", "CF",
"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "D8", "D9", "DA", "DB", "DC", "DD", "DE", "DF",
"E0", "E1", "E2", "E3", "E4", "E5", "E6", "E7", "E8", "E9", "EA", "EB", "EC", "ED", "EE", "EF",
"F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "FA", "FB", "FC", "FD", "FE", "FF"
};
for (int j = 0; j < dwLenDatatoWrite; ++j)
{
BYTE b1 = sContents->getChar(j);
BYTE b2 = pDatatoWrite[j];
if (b1 != b2)
{
NSFile::CFileBinary oFileRes;
if (oFileRes.CreateFileW(NSFile::GetProcessDirectory() + L"/res.txt"))
{
for (int nCounter = 0; nCounter < dwLenDatatoWrite; nCounter++)
{
oFileRes.WriteFile((const BYTE*)c_pHexStrings[pDatatoWrite[nCounter]], 2);
}
oFileRes.CloseFile();
}
RELEASEARRAYOBJECTS(pDatatoWrite);
break;
}
}
pPKCS7Data = (BYTE*)sContents->getCString();
nPKCS7Size = sContents->getLength();
}
int nRes = pCertificate->VerifyPKCS7(pPKCS7Data, nPKCS7Size, pDataForVerify, dwLenDataForVerify);
RELEASEARRAYOBJECTS(pDataForVerify);
oObj1.free();
// Номер аннотации для сопоставления с AP
oRes.AddInt(i);
oRes.AddInt(nRes);
}
oRes.WriteLen();