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

fix

Browse Source
This commit is contained in:
Kulikova Svetlana
2022-06-09 18:07:51 +03:00
parent 334d61559b
commit 97ca849c85
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,7 @@ HEADERS += \
include/Certificate.h \
include/CertificateCommon.h \
include/OOXMLSigner.h \
include/OOXMLVerifier.h \
include/PDFSigner.h
include/OOXMLVerifier.h
HEADERS += \
src/XmlCanonicalizator.h \
@ -35,8 +34,7 @@ SOURCES += \
src/XmlTransform.cpp \
src/CertificateCommon.cpp \
src/OOXMLSigner.cpp \
src/OOXMLVerifier.cpp \
src/PDFSigner.cpp
src/OOXMLVerifier.cpp
core_windows {
HEADERS += src/Certificate_mscrypto.h

4
PdfWriter/Src/Document.cpp
View File

@ -1290,11 +1290,11 @@ namespace PdfWriter
m_pXref = NULL;
return true;
}
void CDocument::Sign(const unsigned int& unPageNum, const TRect& oRect, ICertificate* pCertificate)
void CDocument::Sign(const unsigned int& unPageNum, const TRect& oRect, ICertificate* pCertificate)
{
CSignatureField* pField = CreateSignatureField();
if (m_pSignatureDict)
m_pSignatureDict->SetCert(pCertificate);
m_pSignatureDict->SetCert(pCertificate);
// Сейчас подпись невидимая
// TODO DR, DA и AP (внешнее отображение подписи) должны заполняться в CPdfRenderer::AddFormField(const CFormFieldInfo &oInfo)

2
PdfWriter/Src/Document.h
View File

@ -159,7 +159,7 @@ namespace PdfWriter
CPage* AddPage(int nPageIndex);
bool DeletePage(int nPageIndex);
bool AddToFile(const std::wstring& wsPath, const std::wstring& sTrailer, const std::wstring& sInfo);
void Sign(const unsigned int& unPageNum, const TRect& oRect, ICertificate* pCert);
void Sign(const unsigned int& unPageNum, const TRect& oRect, ICertificate* pCert);
CSignatureDict* GetSignatureDict() { return m_pSignatureDict; }
private:

5
PdfWriter/Src/EncryptDictionary.cpp
View File

@ -335,6 +335,11 @@ namespace PdfWriter
// TODO шифрование записи Contents, для случая одновремменного запароливания и сертификации pdf
pStream->Write(pContents, NULL);
RELEASEOBJECT(pContents);
// Стереть лишний >
BYTE cChar = '0';
pStream->Seek(pStream->Tell() - 1, EWhenceMode::SeekSet);
pStream->Write(&cChar, 1);
}
}
void CSignatureDict::SetCert(ICertificate* pCert)

4
PdfWriter/Src/EncryptDictionary.h
View File

@ -79,14 +79,14 @@ namespace PdfWriter
void SetByteRange(int nLen1, int nOffset2);
void ByteRangeOffset(int nBegin, int nEnd);
void WriteToStream(CStream* pStream, int nFileEnd);
void SetCert(ICertificate* pCert);
void SetCert(ICertificate* pCert);
void SetName(const std::string& sName);
void SetReason(const std::string& sReason);
void SetContacts(const std::string& sContacts);
void SetDate();
private:
ICertificate* m_pCertificate;
ICertificate* m_pCertificate;
int m_nLen1; // Длина первого интервала сигнатуры
int m_nOffset2; // Начало второго интервала сигнатуры

3
PdfWriter/test/test.cpp
View File

@ -85,7 +85,7 @@ int main()
{
std::wstring sCertificateFile = NSFile::GetProcessDirectory() + L"/test.pfx";
std::wstring sPrivateKeyFile = L"";
std::string sCertificateFilePassword = "Sveta03011997";
std::string sCertificateFilePassword = "test";
std::string sPrivateFilePassword = "";
pCertificate = NSCertificate::FromFiles(sPrivateKeyFile, sPrivateFilePassword, sCertificateFile, sCertificateFilePassword);
@ -100,7 +100,6 @@ int main()
RELEASEOBJECT(pReader);
RELEASEINTERFACE(pApplicationFonts);
RELEASEOBJECT(pCertificate);
return 0;
if (bResult && pReader->EditPdf(&pdfWriter, sPassword))