v5.0.3

Feature/ooxmlsign

Common/3dParty/v8/fetch.bat

@@ -5,6 +5,9 @@ if exist "depot_tools" (
 	echo "depot_tools already fetched"
 ) else (
 	call git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+	CD depot_tools
+	git reset --hard e29cf7cb78009c80b04ddeab04763e8d218937c2
+	CD ../
 	call powershell -File .\fix-depot_tools.ps1
 )
 

DesktopEditor/doctrenderer/docbuilder_p.h

@@ -546,6 +546,7 @@ namespace NSDoctRenderer
         std::wstring m_strFilePath;
 
         std::wstring m_strAllFonts;
+        bool m_bIsNotUseConfigAllFontsDir;
 
         std::wstring m_sTmpFolder;
         std::wstring m_sFileDir;
@@ -585,6 +586,8 @@ namespace NSDoctRenderer
 
             m_sGlobalVariable = "";
             m_bIsGlobalVariableUse = false;
+
+            m_bIsNotUseConfigAllFontsDir = false;
         }
 
         void Init()
@@ -634,7 +637,7 @@ namespace NSDoctRenderer
                         oNodes.GetAt(i, _node);
                         std::wstring strFilePath = _node.GetText();
 
-                        if (std::wstring::npos != strFilePath.find(L"AllFonts.js"))
+                        if (std::wstring::npos != strFilePath.find(L"AllFonts.js") && !m_bIsNotUseConfigAllFontsDir)
                         {
                             m_strAllFonts = strFilePath;
 
@@ -1717,6 +1720,11 @@ namespace NSDoctRenderer
             m_pInternal->m_bIsCacheScript = (std::wstring(value) == L"true");
         else if (sParam == "--save-use-only-names")
             m_pInternal->m_sFolderForSaveOnlyUseNames = std::wstring(value);
+        else if (sParam == "--all-fonts-path")
+        {
+            m_pInternal->m_strAllFonts = std::wstring(value);
+            m_pInternal->m_bIsNotUseConfigAllFontsDir = true;
+        }
         else if (sParam == "--argument")
         {
             std::wstring sArg(value);

DesktopEditor/xmlsec/src/src/XmlSigner_mscrypto.h

@@ -219,7 +219,7 @@ public:
 
         HCRYPTPROV hCryptProv = NULL;
 
-        bResult = CryptAcquireCertificatePrivateKey(m_context, 0, NULL, &hCryptProv, &dwKeySpec, NULL);
+        bResult = (NULL != m_context) ? CryptAcquireCertificatePrivateKey(m_context, 0, NULL, &hCryptProv, &dwKeySpec, NULL) : FALSE;
 
         if (!bResult)
             bResult = CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
@@ -252,7 +252,7 @@ public:
             return "";
         }
 
-        BYTE* pDataHashRaw = new BYTE[dwCount];
+        BYTE* pDataHashRaw = (BYTE*)malloc(cbHashSize);
 
         bResult = CryptGetHashParam(hHash, HP_HASHVAL, pDataHashRaw, &cbHashSize, 0);
 
@@ -270,7 +270,7 @@ public:
         std::string sReturn(pBase64_hash, nBase64Len_hash);
         delete [] pBase64_hash;
 
-        //delete [] pDataHashRaw;
+        free(pDataHashRaw);
         CryptDestroyHash(hHash);
         CryptReleaseContext(hCryptProv, 0);
 

Makefile

@@ -43,9 +43,11 @@ endif
 TARGET := $(PLATFORM)_$(ARCHITECTURE)
 
 LIBDIR := build/lib/$(TARGET)
+BINDIR := build/bin/$(TARGET)
 
 ALLFONTSGEN := build/bin/AllFontsGen/$(TARGET)$(EXEC_EXT)
-X2T := build/bin/$(TARGET)/x2t$(EXEC_EXT)
+X2T := $(BINDIR)/x2t$(EXEC_EXT)
+DOCBUILDER := $(BINDIR)/docbuilder$(EXEC_EXT)
 HTMLFILEINTERNAL := $(LIBDIR)/HtmlFileInternal$(EXEC_EXT)
 XLSFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)XlsFormatLib$(LIB_EXT)
 ODFFILEWRITERLIB := $(LIBDIR)/$(LIB_PREFIX)OdfFileWriterLib$(LIB_EXT)
@@ -75,6 +77,7 @@ HUNSPELL := $(LIBDIR)/$(LIB_PREFIX)hunspell$(SHARED_EXT)
 
 TARGETS += $(ALLFONTSGEN)
 TARGETS += $(X2T)
+TARGETS += $(DOCBUILDER)
 TARGETS += $(HTMLFILEINTERNAL)
 TARGETS += $(XLSFORMATLIB)
 TARGETS += $(ODFFILEWRITERLIB)
@@ -105,6 +108,7 @@ TARGETS += $(HUNSPELL)
 X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro)
 HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro)
 ALLFONTSGEN_PRO := $(abspath DesktopEditor/AllFontsGen/AllFontsGen.pro)
+DOCBUILDER_PRO := $(abspath ../core-ext/docbuilder/test_builder/docbuilder.pro)
 XLSFORMATLIB_PRO := $(abspath ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro)
 ODFFILEWRITERLIB_PRO := $(abspath ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro)
 ODFFILEREADERLIB_PRO := $(abspath ASCOfficeOdfFile/linux/OdfFileReaderLib.pro)
@@ -157,6 +161,7 @@ HUNSPELL_PRO := $(abspath DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro)
 QT_PROJ += X2T
 QT_PROJ += HTMLFILEINTERNAL
 QT_PROJ += ALLFONTSGEN
+QT_PROJ += DOCBUILDER
 QT_PROJ += XLSFORMATLIB
 QT_PROJ += ODFFILEWRITERLIB
 QT_PROJ += ODFFILEREADERLIB
@@ -214,6 +219,8 @@ ALLFONTSGEN_DEP += $(GRAPHICS)
 ALLFONTSGEN_DEP += $(OFFICEUTILS)
 ALLFONTSGEN_DEP += $(UNICODECONVERTER)
 
+DOCBUILDER_DEP += $(DOCTRENDERER)
+
 HTMLFILE_DEP += $(UNICODECONVERTER)
 
 RTFFORMATLIB_DEP += $(UNICODECONVERTER)
@@ -271,7 +278,7 @@ bin: $(X2T) $(ALLFONTSGEN)
 
 lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER)
 
-ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL)
+ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL) $(DOCBUILDER)
 
 $(foreach proj, $(QT_PROJ), $(eval $(call build_proj_tmpl, $(proj))))
 
@@ -283,6 +290,8 @@ $(XPSFILE): $(XPSFILE_DEP)
 
 $(ALLFONTSGEN): $(ALLFONTSGEN_DEP)
 
+$(DOCBUILDER): $(DOCBUILDER_DEP)
+
 $(HTMLFILE): $(HTMLFILE_DEP)
 
 $(RTFFORMATLIB): $(RTFFORMATLIB_DEP)

OfficeCryptReader/source/CryptTransform.cpp

@@ -813,7 +813,7 @@ void ECMAEncryptor::UpdateDataIntegrity(unsigned char* data, int  size)
 	cryptData.encryptedHmacKey		= std::string((char*)pEncHmacKey.ptr, pEncHmacKey.size);
 	cryptData.encryptedHmacValue	= std::string((char*)pEncHmacValue.ptr, pEncHmacValue.size);
 }
-
+#define PADDING_SIZE 16 // 8
 int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*& data_out_ptr)
 {
 	data_out_ptr = NULL;
@@ -823,10 +823,10 @@ int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*
 	_buf empty		(NULL, 0, false);
 
 	int size_out = size;
-	if (size_out % 8 != 0) 
-		size_out = (size_out / 8 + 1) * 8;
+	if (size_out % PADDING_SIZE != 0) 
+		size_out = (size_out / PADDING_SIZE + 1) * PADDING_SIZE;
 	
-	data_out_ptr = new unsigned char[size_out + 8]; // real size + padding + size for realsize
+	data_out_ptr = new unsigned char[size_out +	PADDING_SIZE]; // real size + padding + size for realsize
 	
 	_UINT64 nSize = size;
 	memcpy(data_out_ptr, (unsigned char*)&nSize, 8);
@@ -878,8 +878,8 @@ int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*
 
 			EncryptCipher(pDecryptedKey,  iv, pInp, pOut, cryptData.cipherAlgorithm);
 			
-			if (sz % 8 != 0) 
-				sz = (sz / 8 + 1) * 8;
+			if (sz % PADDING_SIZE != 0) 
+				sz = (sz / PADDING_SIZE + 1) * PADDING_SIZE;
 			
 			memcpy(data_out, pOut.ptr, sz);
 
@@ -903,4 +903,4 @@ int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*
 
 
 
-}
+}