OfficeCryptReader - check data integrity

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -178,7 +178,9 @@ namespace BinXlsxRW{
 			{
 				std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(lChartNumber) + L".xlsx";
 				std::wstring sXlsxPath = sEmbedingPath + FILE_SEPARATOR_STR + sXlsxFilename;
+				
 				writeChartXlsx(sXlsxPath, oChartSpace);
+				pReader->m_pRels->m_pManager->m_pContentTypes->AddDefault(L"xlsx");
 
 				std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
 				long rId;

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -409,7 +409,6 @@ namespace PPTX
 					
 					pWriter->StartRecord(4);
 					pWriter->m_pMainDocument->getBinaryContentElem(OOX::et_w_sdtContent, oTextBoxShape.GetPointer(), *pWriter, lDataSize);
-					//pWriter->m_pMainDocument->getBinaryContent(TextBoxShape.get(), *pWriter, lDataSize);
 					pWriter->EndRecord();
 					
 					if (oTextBoxBodyPr.is_init())
@@ -419,6 +418,24 @@ namespace PPTX
 						pWriter->EndRecord();
 					}
 				}
+				else if (strTextBoxShape.is_init())//после конвертации старого шейпа (vml)
+				{
+                    long lDataSize = 0;
+                    ULONG lPos = pWriter->GetPosition();
+					pWriter->SetPosition(lPos);
+					
+					pWriter->StartRecord(4);
+					pWriter->m_pMainDocument->getBinaryContent(strTextBoxShape.get(), *pWriter, lDataSize);
+					pWriter->EndRecord();		
+					
+					if (oTextBoxBodyPr.is_init())
+					{
+						pWriter->StartRecord(5);
+						oTextBoxBodyPr->toPPTY(pWriter);
+						pWriter->EndRecord();
+					}
+				}
+
 				else if (txBody.is_init())
 				{
 					std::wstring strContent = txBody->GetDocxTxBoxContent(pWriter, style);

Makefile

@@ -18,6 +18,7 @@ else
 		SHARED_EXT := .so*
 		SHELL_EXT := .sh
 		LIB_EXT := .a
+		LIB_PREFIX := lib
 		MAKE := make -j $(shell grep -c ^processor /proc/cpuinfo)
 	endif
 	UNAME_P := $(shell uname -p)
@@ -36,29 +37,30 @@ LIBDIR := build/lib/$(TARGET)
 ALLFONTSGEN := build/bin/AllFontsGen/$(TARGET)$(EXEC_EXT)
 X2T := build/bin/$(TARGET)/x2t$(EXEC_EXT)
 HTMLFILEINTERNAL := $(LIBDIR)/HtmlFileInternal$(EXEC_EXT)
-XLSFORMATLIB := $(LIBDIR)/libXlsFormatLib$(LIB_EXT)
-ODFFILEWRITERLIB := $(LIBDIR)/libOdfFileWriterLib$(LIB_EXT)
-ODFFILEREADERLIB := $(LIBDIR)/libOdfFileReaderLib$(LIB_EXT)
-DOCFORMATLIB := $(LIBDIR)/libDocFormatLib$(LIB_EXT)
-PPTFORMATLIB := $(LIBDIR)/libPptFormatLib$(LIB_EXT)
-RTFFORMATLIB := $(LIBDIR)/libRtfFormatLib$(LIB_EXT)
-TXTXMLFORMATLIB := $(LIBDIR)/libTxtXmlFormatLib$(LIB_EXT)
-PDFWRITER := $(LIBDIR)/libPdfWriter$(SHARED_EXT)
-ASCOFFICEDOCXFILE2LIB := $(LIBDIR)/libASCOfficeDocxFile2Lib$(LIB_EXT)
-PPTXFORMATLIB := $(LIBDIR)/libPPTXFormatLib$(LIB_EXT)
-DOCXFORMATLIB := $(LIBDIR)/libDocxFormatLib$(LIB_EXT)
-OFFICEUTILS := $(LIBDIR)/libOfficeUtils$(LIB_EXT)
-GRAPHICS := $(LIBDIR)/libgraphics$(LIB_EXT)
-DOCTRENDERER := $(LIBDIR)/libdoctrenderer$(SHARED_EXT)
-HTMLRENDERER := $(LIBDIR)/libHtmlRenderer$(SHARED_EXT)
-PDFREADER := $(LIBDIR)/libPdfReader$(SHARED_EXT)
-DJVUFILE := $(LIBDIR)/libDjVuFile$(SHARED_EXT)
-XPSFILE := $(LIBDIR)/libXpsFile$(SHARED_EXT)
-HTMLFILE := $(LIBDIR)/libHtmlFile$(SHARED_EXT)
-UNICODECONVERTER := $(LIBDIR)/libUnicodeConverter$(SHARED_EXT)
-ASCDOCUMENTSCORE := $(LIBDIR)/libascdocumentscore$(SHARED_EXT)
-LIBXML := $(LIBDIR)/liblibxml$(LIB_EXT)
-LICENSEMANAGER := $(LIBDIR)/libLicenceManager$(LIB_EXT)
+XLSFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)XlsFormatLib$(LIB_EXT)
+ODFFILEWRITERLIB := $(LIBDIR)/$(LIB_PREFIX)OdfFileWriterLib$(LIB_EXT)
+ODFFILEREADERLIB := $(LIBDIR)/$(LIB_PREFIX)OdfFileReaderLib$(LIB_EXT)
+DOCFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)DocFormatLib$(LIB_EXT)
+PPTFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)PptFormatLib$(LIB_EXT)
+RTFFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)RtfFormatLib$(LIB_EXT)
+TXTXMLFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)TxtXmlFormatLib$(LIB_EXT)
+PDFWRITER := $(LIBDIR)/$(LIB_PREFIX)PdfWriter$(SHARED_EXT)
+ASCOFFICEDOCXFILE2LIB := $(LIBDIR)/$(LIB_PREFIX)ASCOfficeDocxFile2Lib$(LIB_EXT)
+PPTXFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)PPTXFormatLib$(LIB_EXT)
+DOCXFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)DocxFormatLib$(LIB_EXT)
+OFFICEUTILS := $(LIBDIR)/$(LIB_PREFIX)OfficeUtils$(LIB_EXT)
+GRAPHICS := $(LIBDIR)/$(LIB_PREFIX)graphics$(LIB_EXT)
+DOCTRENDERER := $(LIBDIR)/$(LIB_PREFIX)doctrenderer$(SHARED_EXT)
+HTMLRENDERER := $(LIBDIR)/$(LIB_PREFIX)HtmlRenderer$(SHARED_EXT)
+PDFREADER := $(LIBDIR)/$(LIB_PREFIX)PdfReader$(SHARED_EXT)
+DJVUFILE := $(LIBDIR)/$(LIB_PREFIX)DjVuFile$(SHARED_EXT)
+XPSFILE := $(LIBDIR)/$(LIB_PREFIX)XpsFile$(SHARED_EXT)
+HTMLFILE := $(LIBDIR)/$(LIB_PREFIX)HtmlFile$(SHARED_EXT)
+UNICODECONVERTER := $(LIBDIR)/$(LIB_PREFIX)UnicodeConverter$(SHARED_EXT)
+ASCDOCUMENTSCORE := $(LIBDIR)/$(LIB_PREFIX)ascdocumentscore$(SHARED_EXT)
+LIBXML := $(LIBDIR)/$(LIB_PREFIX)libxml$(LIB_EXT)
+LICENSEMANAGER := $(LIBDIR)/$(LIB_PREFIX)LicenceManager$(LIB_EXT)
+OOXMLSIGNATURE := $(LIBDIR)/$(LIB_PREFIX)ooxmlsignature$(LIB_EXT)
 
 TARGETS += $(ALLFONTSGEN)
 TARGETS += $(X2T)
@@ -86,6 +88,7 @@ TARGETS += $(UNICODECONVERTER)
 TARGETS += $(ASCDOCUMENTSCORE)
 TARGETS += $(LIBXML)
 TARGETS += $(LICENSEMANAGER)
+TARGETS += $(OOXMLSIGNATURE)
 
 X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro)
 HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro)
@@ -113,6 +116,7 @@ UNICODECONVERTER_PRO := $(abspath UnicodeConverter/UnicodeConverter.pro)
 ASCDOCUMENTSCORE_PRO := $(abspath ../desktop-sdk/ChromiumBasedEditors/lib/AscDocumentsCore_$(PLATFORM).pro)
 LIBXML_PRO := $(abspath DesktopEditor/xml/build/qt/libxml2.pro)
 LICENSEMANAGER_PRO := $(abspath LicenceManager/linux/LicenseManager.pro)
+OOXMLSIGNATURE_PRO := $(abspath DesktopEditor/xmlsec/src/ooxmlsignature.pro)
 
 # PROS += $(basename $(X2T_PRO)).build
 # PROS += ALLFONTSGEN_PRO
@@ -163,6 +167,7 @@ QT_PROJ += UNICODECONVERTER
 QT_PROJ += ASCDOCUMENTSCORE
 QT_PROJ += LIBXML
 QT_PROJ += LICENSEMANAGER
+QT_PROJ += OOXMLSIGNATURE
 
 # X2T_DEP += $(XLSFORMATLIB)
 # X2T_DEP += $(ODFFILEWRITERLIB)
@@ -211,6 +216,9 @@ ASCDOCUMENTSCORE_DEP += $(DJVUFILE)
 ASCDOCUMENTSCORE_DEP += $(XPSFILE)
 #ASCDOCUMENTSCORE_DEP += $(LICENSEMANAGER)
 ASCDOCUMENTSCORE_DEP += $(LIBXML)
+ASCDOCUMENTSCORE_DEP += $(OOXMLSIGNATURE)
+
+OOXMLSIGNATURE_DEP += $(LIBXML)
 
 PDFREADER_DEP += $(HTMLRENDERER)
 
@@ -262,6 +270,8 @@ $(PDFREADER): $(PDFREADER_DEP)
 
 $(PDFWRITER): $(PDFWRITER_DEP)
 
+$(OOXMLSIGNATURE): $(OOXMLSIGNATURE_DEP)
+
 %.build/Makefile: %.pro
 	mkdir -p $(dir $@) && cd $(dir $@) && qmake -r $<
 

OfficeCryptReader/Test/Test.cpp

@@ -12,9 +12,11 @@ int _tmain(int argc, _TCHAR* argv[])
 	std::wstring password = L"password";
 
 	ECMACryptFile crypt_file;
-	crypt_file.DecryptOfficeFile(srcFileName, dstFileName, password);
+	bool result, bDataIntegrity;
+		
+	result = crypt_file.DecryptOfficeFile(srcFileName, dstFileName, password, bDataIntegrity);
 
-	crypt_file.EncryptOfficeFile(dstFileName, dstFileName2, password);
+	result = crypt_file.EncryptOfficeFile(dstFileName, dstFileName2, password);
 
 	return 0;
 }

OfficeCryptReader/source/CryptTransform.cpp

@@ -488,8 +488,10 @@ void ECMADecryptor::Decrypt(char* data	, const size_t size, const unsigned long
 		}
 	}
 }
-bool ECMADecryptor::IsDataIntegrity(unsigned char* data, int  size)
+bool ECMADecryptor::CheckDataIntegrity(unsigned char* data, int  size)
 {
+	if (cryptData.bAgile == false) return true;
+
 	_buf pBlockKey		((unsigned char*)encrKeyValueBlockKey, 8);	
 	_buf pBlockHmacKey	((unsigned char*)encrDataIntegritySaltBlockKey, 8);	
 	_buf pBlockHmacValue((unsigned char*)encrDataIntegrityHmacValueBlockKey, 8);	
@@ -522,7 +524,7 @@ bool ECMADecryptor::IsDataIntegrity(unsigned char* data, int  size)
 
 	std::string sData((char*)data, size);
 	_buf hmac = Hmac(salt, cryptData.hashAlgorithm, sData);
-	
+		
 	return (hmac == expected);
 }
 void ECMADecryptor::Decrypt(unsigned char* data_ptr, int  data_size, unsigned char*& data_out)
@@ -540,8 +542,6 @@ void ECMADecryptor::Decrypt(unsigned char* data_ptr, int  data_size, unsigned ch
 
 	if (cryptData.bAgile)
 	{	
-		bool isDataIntegrity = IsDataIntegrity(data_ptr, data_size);
-
 		_buf pBlockKey	((unsigned char*)encrKeyValueBlockKey, 8);	
 		_buf pDataSalt	(cryptData.dataSaltValue);
 		_buf pKeyValue	(cryptData.encryptedKeyValue);
@@ -603,6 +603,7 @@ void ECMADecryptor::Decrypt(unsigned char* data_ptr, int  data_size, unsigned ch
 		DecryptCipher(hashKey, empty, pInp, pOut, cryptData.cipherAlgorithm);
 	}
 }
+
 //-----------------------------------------------------------------------------------------------------------
 ECMAEncryptor::ECMAEncryptor()
 {
@@ -622,6 +623,7 @@ void ECMAEncryptor::GetCryptData(_ecmaCryptData &data)
 {
 	data = cryptData;
 }
+
 void ECMAEncryptor::UpdateDataIntegrity(unsigned char* data, int  size)
 {
 	if (cryptData.bAgile == false) return;
@@ -636,31 +638,32 @@ void ECMAEncryptor::UpdateDataIntegrity(unsigned char* data, int  size)
 
 	_buf pDataSalt		(cryptData.dataSaltValue);
 	_buf pKeyValue		(cryptData.encryptedKeyValue);
-	_buf pEncHmacKey	(cryptData.encryptedHmacKey);
-	_buf pEncHmacValue	(cryptData.encryptedHmacValue);
-
+	
 	_buf agileKey = GenerateAgileKey( pSalt, pPassword, pBlockKey, cryptData.keySize, cryptData.spinCount, cryptData.hashAlgorithm);  
 
 	_buf secretKey;
 	DecryptCipher( agileKey, pSalt, pKeyValue, secretKey, cryptData.cipherAlgorithm);  
-//----			
+	
 	_buf iv1 = HashAppend(pDataSalt, pBlockHmacKey, cryptData.hashAlgorithm);
 	CorrectHashSize(iv1, cryptData.blockSize, 0x36);
 	
 	_buf iv2 = HashAppend(pDataSalt, pBlockHmacValue, cryptData.hashAlgorithm);
 	CorrectHashSize(iv2, cryptData.blockSize, 0x36);
 
-	_buf salt;
-	DecryptCipher(secretKey,  iv1, pEncHmacKey, salt, cryptData.cipherAlgorithm);
-	
-	_buf expected;
-	DecryptCipher(secretKey,  iv2, pEncHmacValue, expected, cryptData.cipherAlgorithm);
-
+//----
 	std::string sData((char*)data, size);
-	_buf hmac = Hmac(salt, cryptData.hashAlgorithm, sData);
-	
-	//return (hmac == expected);
+	_buf hmac = Hmac(pSalt, cryptData.hashAlgorithm, sData);
+
+	_buf pEncHmacKey;
+	EncryptCipher(secretKey,  iv1, pSalt, pEncHmacKey, cryptData.cipherAlgorithm);
+
+	_buf pEncHmacValue;
+	EncryptCipher(secretKey,  iv2, hmac, pEncHmacValue, cryptData.cipherAlgorithm);
+
+	cryptData.encryptedHmacKey		= std::string((char*)pEncHmacKey.ptr, pEncHmacKey.size);
+	cryptData.encryptedHmacValue	= std::string((char*)pEncHmacValue.ptr, pEncHmacValue.size);
 }
+
 int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*& data_out_ptr)
 {
 	data_out_ptr = NULL;

OfficeCryptReader/source/CryptTransform.h

@@ -133,11 +133,12 @@ public:
 	virtual bool SetPassword (std::wstring password);
 	virtual bool IsVerify();
 
+	bool CheckDataIntegrity(unsigned char* data, int  size);
+
 	void SetCryptData(_ecmaCryptData &data);
 	
 private:
-	bool IsDataIntegrity(unsigned char* data, int  size);
-	
+
 	std::wstring	password;
 	_ecmaCryptData	cryptData;
 	bool			bVerify;

OfficeCryptReader/source/ECMACryptFile.cpp

@@ -575,6 +575,9 @@ bool ECMACryptFile::EncryptOfficeFile(std::wstring file_name_inp, std::wstring f
 	{
 		unsigned char* data_out2	= NULL;
 		decryptor.Decrypt(data_out, lengthData, data_out2);
+		
+		bool bDataIntegrity = decryptor.CheckDataIntegrity(data_out, lengthData);
+		
 		NSFile::CFileBinary test;
 
 		test.CreateFileW(file_name_out + L"-back.oox");
@@ -586,8 +589,10 @@ bool ECMACryptFile::EncryptOfficeFile(std::wstring file_name_inp, std::wstring f
 	return true;
 }
 
-bool ECMACryptFile::DecryptOfficeFile(std::wstring file_name_inp, std::wstring file_name_out, std::wstring password)
+bool ECMACryptFile::DecryptOfficeFile(std::wstring file_name_inp, std::wstring file_name_out, std::wstring password, bool & bDataIntegrity)
 {
+	bDataIntegrity = false;
+
 	POLE::Storage *pStorage = new POLE::Storage(file_name_inp.c_str());
 	
 	if (!pStorage)return false;
@@ -597,45 +602,10 @@ bool ECMACryptFile::DecryptOfficeFile(std::wstring file_name_inp, std::wstring f
 		delete pStorage;
 		return false;
 	}
-	_ecmaCryptData cryptData;
+//-------------------------------------------------------------------------------------------
+	_ecmaCryptData cryptData;	
 	bool result = false;
 
-//------------------------------------------------------------------------
-	//{
-	//	std::wstring f = file_name_out + L"-1.docx";
-	//	POLE::Storage *pStorage1 = new POLE::Storage(f.c_str());
-	//	pStorage1->open(true, true);
-
-	//	POLE::Stream *pStrIn = new POLE::Stream(pStorage, "EncryptionInfo");
-	//	POLE::uint64 sz = pStrIn->size();
-	//	POLE::Stream *pStrOut = new POLE::Stream(pStorage1, "EncryptionInfo", true, sz);
-
-	//	BYTE *d = new BYTE [sz];
-	//	pStrIn->read(d, sz);
-	//	pStrOut->write(d, sz);
-	//	delete d;
-
-	//	pStrOut->flush();
-	//	delete pStrOut;
-	//	delete pStrIn;
-
-	//	pStrIn = new POLE::Stream(pStorage, "EncryptedPackage");
-	//	sz = pStrIn->size();
-	//	pStrOut = new POLE::Stream(pStorage1, "EncryptedPackage", true, sz);
-
-	//	d = new BYTE [sz];
-	//	pStrIn->read(d, sz);
-	//	pStrOut->write(d, sz);
-	//	delete d;
-
-	//	pStrOut->flush();
-	//	delete pStrOut;
-	//	delete pStrIn;
-
-	//	pStorage1->close();
-	//	delete pStorage1;
-	//}
-//----------------------------------------------------------------------------
 	POLE::Stream *pStream = new POLE::Stream(pStorage, "EncryptionInfo");
 
 	if (pStream)
@@ -747,8 +717,6 @@ bool ECMACryptFile::DecryptOfficeFile(std::wstring file_name_inp, std::wstring f
 		lengthData = *((_UINT64*)data);
 
 		decryptor.Decrypt(data, readTrue, data_out);//todoo сделать покусочное чтение декриптование
-		delete pStream;
-		delete []data;
 
 		if (data_out)
 		{
@@ -760,11 +728,16 @@ bool ECMACryptFile::DecryptOfficeFile(std::wstring file_name_inp, std::wstring f
 			delete []data_out;
 			result = true;
 		}
+
+		bDataIntegrity = decryptor.CheckDataIntegrity(data, readTrue);
+		
+		delete pStream;
+		delete []data;
 	}
 //-------------------------------------------------------------------
 	delete pStorage;
 
-	cryptDataGlobal = cryptData;
+	cryptDataGlobal = cryptData; // for encrypt like sample
 
 	return result;
 }

OfficeCryptReader/source/ECMACryptFile.h

@@ -37,7 +37,7 @@
 class ECMACryptFile
 {
 public:	
-	bool DecryptOfficeFile(std::wstring file_name_inp, std::wstring file_name_out, std::wstring password);
+	bool DecryptOfficeFile(std::wstring file_name_inp, std::wstring file_name_out, std::wstring password, bool & bDataIntegrity);
 	bool EncryptOfficeFile(std::wstring file_name_inp, std::wstring file_name_out, std::wstring password);
 
 	struct _refComponent

X2tConverter/src/ASCConverters.cpp

@@ -1457,14 +1457,21 @@ namespace NExtractTools
 	int mscrypt2oox	 (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
 	{
         std::wstring password = params.getPassword();
-        //decrypt to sTo
+
 		ECMACryptFile cryptReader;
-        if (cryptReader.DecryptOfficeFile(sFrom, sTo, password) == false)
+		bool bDataIntegrity = false;
+
+        if (cryptReader.DecryptOfficeFile(sFrom, sTo, password, bDataIntegrity) == false)
 		{
              if (password.empty())	return AVS_FILEUTILS_ERROR_CONVERT_DRM;
             else					return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD;
 		}
 
+		if (bDataIntegrity == false)
+		{
+			//было несанкционированое вешательство в файл
+		}
+
 		return S_OK;
 	}
 	int mscrypt2oot_bin	 (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
@@ -1473,9 +1480,16 @@ namespace NExtractTools
         std::wstring sResultDecryptFile = sTemp	+ FILE_SEPARATOR_STR + L"uncrypt_file.oox";
 
 		ECMACryptFile cryptReader;
-		if (cryptReader.DecryptOfficeFile(sFrom, sResultDecryptFile, params.getPassword()) == false)
+		bool bDataIntegrity = false;
+
+		if (cryptReader.DecryptOfficeFile(sFrom, sResultDecryptFile, params.getPassword(), bDataIntegrity) == false)
 			return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD;
 
+		if (bDataIntegrity == false)
+		{
+			//было несанкционированое вешательство в файл
+		}
+
 		COfficeFileFormatChecker OfficeFileFormatChecker;
 
 		if (OfficeFileFormatChecker.isOfficeFile(sResultDecryptFile))