.

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/Editor/BinaryFileReaderWriter.cpp

@@ -282,6 +282,12 @@ namespace NSBinPptxRW
 			m_pContentTypes->AddDefault(strExts.substr(1));
 		}
 
+		if (oleData.empty() == false)
+		{
+			//plugins data - generate ole
+			typeAdditional = 1;
+		}
+
 		_imageManager2Info oImageManagerInfo = GenerateImageExec(strImage, strExts, strAdditional, typeAdditional, oleData);
 
 		if (!oImageManagerInfo.sFilepathAdditional.empty()) 
@@ -346,8 +352,11 @@ namespace NSBinPptxRW
 		{
 			oPathOutput = m_strDstMedia + FILE_SEPARATOR_STR + strImage + strExts;
 
-			if (oPathOutput.GetPath() != strInput)
-                CDirectory::CopyFile(strInput, oPathOutput.GetPath());
+			if (oPathOutput.GetPath() != strInput && NSFile::CFileBinary::Exists(strInput))
+			{
+                NSFile::CFileBinary::Copy(strInput, oPathOutput.GetPath());
+				oImageManagerInfo.sFilepathImage = oPathOutput.GetPath();
+			}
 		}
 		else
 		{
@@ -355,8 +364,8 @@ namespace NSBinPptxRW
 			strExts = _T(".png");
 			oPathOutput = m_strDstMedia + FILE_SEPARATOR_STR + strImage + strExts;
             SaveImageAsPng(strInput, oPathOutput.GetPath());
+			oImageManagerInfo.sFilepathImage = oPathOutput.GetPath();
 		}		
-		oImageManagerInfo.sFilepathImage = oPathOutput.GetPath();
 		
 		if ((!strAdditionalImage.empty() || !oleData.empty() ) && (nAdditionalType == 1))
 		{
@@ -374,13 +383,14 @@ namespace NSBinPptxRW
 			if(!oleData.empty())
 			{
 				WriteOleData(strAdditionalImageOut, oleData);
+				oImageManagerInfo.sFilepathAdditional = strAdditionalImageOut;
 			}
-			else
+			else if (NSFile::CFileBinary::Exists(strAdditionalImage))
 			{
-                CDirectory::CopyFile(strAdditionalImage, strAdditionalImageOut);
+				NSFile::CFileBinary::Copy(strAdditionalImage, strAdditionalImageOut);
+				oImageManagerInfo.sFilepathAdditional = strAdditionalImageOut;
 			}
 
-			oImageManagerInfo.sFilepathAdditional = strAdditionalImageOut;
 		}
 		else if (!strAdditionalImage.empty() && nAdditionalType == 2)
 		{			
@@ -395,8 +405,11 @@ namespace NSBinPptxRW
 			
 			std::wstring strAdditionalImageOut = pathOutput.GetPath();
 
-			CDirectory::CopyFile(strAdditionalImage, strAdditionalImageOut);
-			oImageManagerInfo.sFilepathAdditional = strAdditionalImageOut;
+			if (NSFile::CFileBinary::Exists(strAdditionalImage))
+			{
+				NSFile::CFileBinary::Copy(strAdditionalImage, strAdditionalImageOut);
+				oImageManagerInfo.sFilepathAdditional = strAdditionalImageOut;
+			}
 		}
 
 		return oImageManagerInfo;
@@ -1236,24 +1249,28 @@ namespace NSBinPptxRW
 		if (m_pManager->m_nDocumentType == XMLWRITER_DOC_TYPE_DOCX)	strImageRelsPath = L"media/";
 		else														strImageRelsPath = L"../media/";
 
-		strImageRelsPath += OOX::CPath(oImageManagerInfo.sFilepathImage).GetFilename();
-
-		std::map<std::wstring, _relsGeneratorInfo>::iterator pPair = m_mapImages.find(strImageRelsPath);
-
-		if (m_mapImages.end() != pPair)
-		{
-			return pPair->second;				
-		}
 		_relsGeneratorInfo oRelsGeneratorInfo;
 		
-		oRelsGeneratorInfo.nImageRId		= m_lNextRelsID++;
-		oRelsGeneratorInfo.sFilepathImage	= oImageManagerInfo.sFilepathImage;
-		
-		std::wstring strRid = L"rId" + std::to_wstring(oRelsGeneratorInfo.nImageRId);
+		if (!oImageManagerInfo.sFilepathImage.empty())
+		{
+			strImageRelsPath += OOX::CPath(oImageManagerInfo.sFilepathImage).GetFilename();
 
-		m_pWriter->WriteString( L"<Relationship Id=\"" + strRid + 
-			L"\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image\" Target=\"" + strImageRelsPath +
-			L"\"/>");
+			std::map<std::wstring, _relsGeneratorInfo>::iterator pPair = m_mapImages.find(strImageRelsPath);
+
+			if (m_mapImages.end() != pPair)
+			{
+				return pPair->second;				
+			}
+			
+			oRelsGeneratorInfo.nImageRId		= m_lNextRelsID++;
+			oRelsGeneratorInfo.sFilepathImage	= oImageManagerInfo.sFilepathImage;
+			
+			std::wstring strRid = L"rId" + std::to_wstring(oRelsGeneratorInfo.nImageRId);
+
+			m_pWriter->WriteString( L"<Relationship Id=\"" + strRid + 
+				L"\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image\" Target=\"" + strImageRelsPath +
+				L"\"/>");
+		}
 
 		if(additionalFile.is<OOX::OleObject>())
 		{
@@ -1285,7 +1302,7 @@ namespace NSBinPptxRW
 				}
 			}
 		}
-		if(additionalFile.is<OOX::Media>())
+		else if(additionalFile.is<OOX::Media>())
 		{
 			smart_ptr<OOX::Media> mediaFile = additionalFile.smart_dynamic_cast<OOX::Media>();
 			

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/Bullet.h

@@ -187,8 +187,25 @@ namespace PPTX
 						break;
 					}
 				case BULLET_TYPE_BULLET_BLIP:
-					// TODO:
-					break;
+				{
+					pReader->Skip(5); // len + type + start attr
+					
+					Logic::BuBlip *pBuBlip = new Logic::BuBlip();
+					pBuBlip->blip.fromPPTY(pReader);
+
+					if (pBuBlip->blip.embed.IsInit())
+					{
+						m_Bullet.reset(pBuBlip);
+					}
+					else
+					{//??? сбой ???
+						delete pBuBlip;
+
+						Logic::BuChar *pBuChar = new Logic::BuChar();
+						pBuChar->Char = wchar_t(L'\x2022');
+						m_Bullet.reset(pBuChar);				
+					}
+				}break;
 				default:
 					m_Bullet.reset(new Logic::BuNone());
 					break;

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.cpp

@@ -257,5 +257,129 @@ namespace PPTX
 			pWriter->EndRecord();
 		}
 
+		void Blip::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
+		{
+			LONG _s2 = pReader->GetPos();
+			LONG _e2 = _s2 + pReader->GetLong() + 4;
+
+			pReader->Skip(1);
+
+			while (true)
+			{
+				BYTE _at = pReader->GetUChar_TypeNode();
+				if (NSBinPptxRW::g_nodeAttributeEnd == _at)
+					break;
+
+				if (_at == 0)
+					pReader->Skip(1);
+			}
+
+			while (pReader->GetPos() < _e2)
+			{
+				BYTE _t = pReader->GetUChar();
+
+				switch (_t)
+				{
+					case 0:
+					case 1:
+					{
+						// id. embed / link
+						pReader->Skip(4);
+						break;
+					}
+					case 10:
+					case 11:
+					{
+						// id. embed / link
+						pReader->GetString2();
+						break;
+					}
+					case 2:
+					{
+						pReader->Skip(4);
+						ULONG count_effects = pReader->GetULong();
+						for (ULONG _eff = 0; _eff < count_effects; ++_eff)
+						{
+							pReader->Skip(1); // type 
+							ULONG rec_len = pReader->GetULong();
+							if (0 == rec_len)
+								continue;
+							
+							BYTE rec = pReader->GetUChar();
+							
+							if (rec == EFFECT_TYPE_ALPHAMODFIX)
+							{
+								// alpha!!!
+								LONG _e22 = pReader->GetPos() + pReader->GetLong() + 4;
+
+								pReader->Skip(1); // startattr
+
+								PPTX::Logic::AlphaModFix* pEffect = new PPTX::Logic::AlphaModFix();
+								while (true)
+								{
+									BYTE _at = pReader->GetUChar_TypeNode();
+									if (NSBinPptxRW::g_nodeAttributeEnd == _at)
+										break;
+
+									if (_at == 0)
+										pEffect->amt = pReader->GetLong();
+								}
+
+								Effects.push_back(UniEffect());
+								Effects[0].InitPointer(pEffect);
+
+								pReader->Seek(_e22);
+							}
+							else
+							{
+								pReader->SkipRecord();
+							}
+						}
+						break;
+					}
+					case 3:
+					{
+						pReader->Skip(6); // len + start attributes + type
+
+						std::wstring strImagePath = pReader->GetString2();
+
+						if (0 != strImagePath.find(_T("http:")) &&
+							0 != strImagePath.find(_T("https:")) &&
+							0 != strImagePath.find(_T("ftp:")) &&
+							0 != strImagePath.find(_T("file:")))
+						{
+							if (0 == strImagePath.find(_T("theme")))
+							{
+                                strImagePath = pReader->m_strFolderExternalThemes + FILE_SEPARATOR_STR  + strImagePath;
+							}
+							else
+							{
+                                strImagePath = pReader->m_strFolder + FILE_SEPARATOR_STR + _T("media")  + FILE_SEPARATOR_STR + strImagePath;
+							}
+
+							OOX::CPath pathUrl = strImagePath;
+							strImagePath = pathUrl.GetPath();
+						}
+	
+						smart_ptr<OOX::File> additionalFile;
+						NSBinPptxRW::_relsGeneratorInfo oRelsGeneratorInfo = pReader->m_pRels->WriteImage(strImagePath, additionalFile, L"", L"");
+
+						if (oRelsGeneratorInfo.nImageRId > 0)
+						{
+							embed = new OOX::RId((size_t)oRelsGeneratorInfo.nImageRId);
+						}
+						pReader->Skip(1); // end attribute
+						break;
+					}
+					default:
+					{
+						pReader->SkipRecord();
+						break;
+					}
+				}
+			}
+
+			pReader->Seek(_e2);
+		}
 	} // namespace Logic
 } // namespace PPTX

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Blip.h

@@ -91,6 +91,7 @@ namespace PPTX
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
 
 			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
+			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
 			
 			virtual std::wstring GetFullPicName(OOX::IFileContainer* pRels = NULL)const;
 			virtual std::wstring GetFullOleName(const OOX::RId& pRId, OOX::IFileContainer* pRels = NULL)const;

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/BlipFill.h

@@ -447,7 +447,10 @@ namespace PPTX
 										if (!blip.is_init())
 											blip = new PPTX::Logic::Blip();
 
-										blip->embed = new OOX::RId((size_t)oRelsGeneratorInfo.nImageRId);
+										if (oRelsGeneratorInfo.nImageRId > 0)
+										{
+											blip->embed = new OOX::RId((size_t)oRelsGeneratorInfo.nImageRId);
+										}
 										
 										if(oRelsGeneratorInfo.nOleRId > 0)
 										{

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -1136,8 +1136,18 @@ namespace PPTX
 				}
 			}
 
-			if (spPr.Geometry.is_init())
+			bool bRect = bOle; //ole ВСЕГДА rect
+
+			if (spPr.Geometry.is<PPTX::Logic::PrstGeom>())
 			{
+				const PPTX::Logic::PrstGeom & lpGeom = spPr.Geometry.as<PPTX::Logic::PrstGeom>();
+
+				if( lpGeom.prst.get() == L"rect" ) 
+					bRect = true;
+			}
+
+			if (bRect == false)
+			{//custom vml shape
                 std::wstring strPath;
                 std::wstring strTextRect;
 
@@ -1324,7 +1334,9 @@ namespace PPTX
 			}
 			if(oleObject->m_oId.IsInit())
 			{
-				blipFill.blip->oleRid = oleObject->m_oId.get().ToString();
+				if (blipFill.blip.IsInit() == false)
+					blipFill.blip.Init();
+				blipFill.blip->oleRid = oleObject->m_oId->get();
 			}
 		}
 	} // namespace Logic

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);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELLTABLE.cpp

@@ -221,7 +221,7 @@ int CELL_GROUP::serialize(std::wostream & stream)
 							CP_XML_ATTR(L"customFormat", true);
 						}
 					}
-					if (row->miyRw > 0/* && std::abs(row->miyRw/20. - sheet_info.defaultRowHeight) > 0.01*/)
+					if (row->miyRw > 0 && row->miyRw < 0x8000) //v8_14A_1b13.xls
 					{
 						CP_XML_ATTR(L"ht", row->miyRw / 20.);
 						CP_XML_ATTR(L"customHeight", true);

Common/DocxFormat/Source/XML/Utils.h

@@ -369,6 +369,71 @@ namespace XmlUtils
 
         return buffer;
 	}
+	AVSINLINE static std::wstring EncodeXmlStringExtend(const std::wstring& data, bool bDeleteNoUnicode = false)
+	{
+		std::wstring buffer;
+		buffer.reserve(data.size());
+
+		if(bDeleteNoUnicode)
+		{
+			for(size_t pos = 0; pos < data.size(); ++pos)
+			{
+				switch(data[pos])
+				{
+					case '&':  buffer.append(L"&amp;");      break;
+					case '\"': buffer.append(L"&quot;");     break;
+					case '\'': buffer.append(L"&apos;");     break;
+					case '<':  buffer.append(L"&lt;");       break;
+					case '>':  buffer.append(L"&gt;");       break;
+					case '\n': buffer.append(L"&#xA;");      break;
+					case '\r': buffer.append(L"&#xD;");      break;
+					case '\t': buffer.append(L"&#x9;");      break;
+					case 160:  buffer.append(L"&#160;");     break;
+					default:
+					{
+						if ( false == IsUnicodeSymbol( data[pos] ) )
+						{
+							wchar_t symbol1 = data[pos];
+							if(0xD800 <= symbol1 && symbol1 <= 0xDFFF && pos + 1 < data.size())
+							{
+								pos++;
+								wchar_t symbol2 = data[pos];
+								if (symbol1 < 0xDC00 && symbol2 >= 0xDC00 && symbol2 <= 0xDFFF)
+								{
+									buffer.append(&data[pos-1], 2);
+								}
+							}
+						}
+						else
+							buffer.append(&data[pos], 1);
+					}break;
+				}
+			}
+		}
+		else
+		{
+			for(size_t pos = 0; pos < data.size(); ++pos)
+			{
+				switch(data[pos])
+				{
+					case '&':  buffer.append(L"&amp;");      break;
+					case '\"': buffer.append(L"&quot;");     break;
+					case '\'': buffer.append(L"&apos;");     break;
+					case '<':  buffer.append(L"&lt;");       break;
+					case '>':  buffer.append(L"&gt;");       break;
+					case '\n': buffer.append(L"&#xA;");      break;
+					case '\r': buffer.append(L"&#xD;");      break;
+					case '\t': buffer.append(L"&#x9;");      break;
+					case 160:  buffer.append(L"&#160;");     break;
+					case '\0':
+						return buffer;
+					default:   buffer.append(&data[pos], 1);	break;
+				}
+			}
+		}
+
+		return buffer;
+	}
 //#ifndef _USE_LIBXML2_READER_
 	class CStringWriter
 	{

DesktopEditor/xml/build/qt/libxml2.pro

@@ -11,18 +11,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 QMAKE_CXXFLAGS += -Wall -g
 
-DEFINES += \
-    LIBXML_READER_ENABLED \
-    LIBXML_PUSH_ENABLED \
-    LIBXML_HTML_ENABLED \
-    LIBXML_XPATH_ENABLED \
-    LIBXML_OUTPUT_ENABLED \
-    LIBXML_C14N_ENABLED \
-    LIBXML_SAX1_ENABLED \
-    LIBXML_TREE_ENABLED \
-    LIBXML_XPTR_ENABLED \
-    IN_LIBXML \
-    LIBXML_STATIC
+CONFIG += core_static_link_xml_full
 
 CORE_ROOT_DIR = $$PWD/../../../..
 PWD_ROOT_DIR = $$PWD

DesktopEditor/xmlsec/libxmlsec.pro

@@ -19,7 +19,8 @@ PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 
 INCLUDEPATH += \
-    $$PWD_ROOT_DIR/xmlsec/include
+    $$PWD_ROOT_DIR/xmlsec/include \
+    $$CORE_ROOT_DIR/DesktopEditor/xml/build/qt
 
 DEFINES += \
     LIBXML_READER_ENABLED \
@@ -38,15 +39,15 @@ include($$CORE_ROOT_DIR/DesktopEditor/xml/build/qt/libxml2_src.pri)
 
 DEFINES += PACKAGE=\\\"xmlsec1\\\"
 DEFINES += VERSION=\\\"1.2.23\\\"
-DEFINES += XMLSEC_DEFAULT_CRYPTO=\\\"mscrypto\\\"
+DEFINES += XMLSEC_DEFAULT_CRYPTO=\\\"openssl\\\"
 
 DEFINES += \
     IN_XMLSEC \
     XMLSEC_STATIC
 
 core_linux {
-    CONFIG += use_gcrypt
-    CONFIG += use_gnutls
+    #CONFIG += use_gcrypt
+    #CONFIG += use_gnutls
     #CONFIG += use_mscrypto
     #CONFIG += use_nss
     CONFIG += use_openssl
@@ -246,6 +247,10 @@ SOURCES += \
 
 use_openssl {
 
+    DEFINES += XMLSEC_OPENSSL_110
+
+    INCLUDEPATH += $$PWD/openssl/include
+
 HEADERS += \
     xmlsec/include/xmlsec/openssl/app.h \
     xmlsec/include/xmlsec/openssl/bn.h \
@@ -258,21 +263,21 @@ HEADERS += \
     xmlsec/src/openssl/openssl11_wrapper.h
 
 SOURCES += \
-    xmlsec/src/openssl/app.c \
-    xmlsec/src/openssl/bn.c \
-    xmlsec/src/openssl/ciphers.c \
-    xmlsec/src/openssl/crypto.c \
-    xmlsec/src/openssl/digests.c \
-    xmlsec/src/openssl/evp.c \
-    xmlsec/src/openssl/evp_signatures.c \
-    xmlsec/src/openssl/hmac.c \
-    xmlsec/src/openssl/kt_rsa.c \
-    xmlsec/src/openssl/kw_aes.c \
-    xmlsec/src/openssl/kw_des.c \
-    xmlsec/src/openssl/signatures.c \
-    xmlsec/src/openssl/symkeys.c \
-    xmlsec/src/openssl/x509.c \
-    xmlsec/src/openssl/x509vfy.c
+    xmlsec/src/openssl/_app.c \
+    xmlsec/src/openssl/_bn.c \
+    xmlsec/src/openssl/_ciphers.c \
+    xmlsec/src/openssl/_crypto.c \
+    xmlsec/src/openssl/_digests.c \
+    xmlsec/src/openssl/_evp.c \
+    xmlsec/src/openssl/_evp_signatures.c \
+    xmlsec/src/openssl/_hmac.c \
+    xmlsec/src/openssl/_kt_rsa.c \
+    xmlsec/src/openssl/_kw_aes.c \
+    xmlsec/src/openssl/_kw_des.c \
+    xmlsec/src/openssl/_signatures.c \
+    xmlsec/src/openssl/_symkeys.c \
+    xmlsec/src/openssl/_x509.c \
+    xmlsec/src/openssl/_x509vfy.c
 
 }
 

DesktopEditor/xmlsec/src/src/OOXMLVerifier.cpp

@@ -174,7 +174,8 @@ public:
             return;
         }
 
-        std::wstring sSetupID = FindFirstChild(GetObjectById("idOfficeObject"), L"SetupID").GetText();
+        XmlUtils::CXmlNode firstChild = GetObjectById("idOfficeObject");
+        std::wstring sSetupID = FindFirstChild(firstChild, L"SetupID").GetText();
         m_guid = U_TO_UTF8(sSetupID);
 
         // 2) Images

DesktopEditor/xmlsec/test/openssl_linux/main.cpp

@@ -0,0 +1,292 @@
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs12.h>
+
+#include <openssl/sha.h>
+
+#include "../../../common/File.h"
+
+static time_t ASN1_GetTimeT(ASN1_TIME* time)
+{
+    struct tm t;
+    const char* str = (const char*) time->data;
+    size_t i = 0;
+
+    memset(&t, 0, sizeof(t));
+
+    if (time->type == V_ASN1_UTCTIME) {/* two digit year */
+        t.tm_year = (str[i++] - '0') * 10;
+        t.tm_year += (str[i++] - '0');
+        if (t.tm_year < 70)
+            t.tm_year += 100;
+    } else if (time->type == V_ASN1_GENERALIZEDTIME) {/* four digit year */
+        t.tm_year = (str[i++] - '0') * 1000;
+        t.tm_year+= (str[i++] - '0') * 100;
+        t.tm_year+= (str[i++] - '0') * 10;
+        t.tm_year+= (str[i++] - '0');
+        t.tm_year -= 1900;
+    }
+    t.tm_mon  = (str[i++] - '0') * 10;
+    t.tm_mon += (str[i++] - '0') - 1; // -1 since January is 0 not 1.
+    t.tm_mday = (str[i++] - '0') * 10;
+    t.tm_mday+= (str[i++] - '0');
+    t.tm_hour = (str[i++] - '0') * 10;
+    t.tm_hour+= (str[i++] - '0');
+    t.tm_min  = (str[i++] - '0') * 10;
+    t.tm_min += (str[i++] - '0');
+    t.tm_sec  = (str[i++] - '0') * 10;
+    t.tm_sec += (str[i++] - '0');
+
+    /* Note: we did not adjust the time based on time zone information */
+    return mktime(&t);
+}
+
+#if 1
+int main()
+{
+    std::wstring sFolderW = NSFile::GetProcessDirectory();
+    std::string sFolder = U_TO_UTF8(sFolderW);
+    std::string __file = sFolder + "/settings.xml";
+    std::string __key = sFolder + "/rsakey.pem";
+    std::string __cert = sFolder + "/rsacert.pem";
+
+    ASN1_INTEGER *asn1_serial = NULL;
+    BIO              *certbio = NULL;
+    BIO               *outbio = NULL;
+    X509                *cert = NULL;
+    const char *neg;
+    int ret, i;
+    long l;
+
+    /* ---------------------------------------------------------- *
+    * These function calls initialize openssl for correct work.  *
+    * ---------------------------------------------------------- */
+    OpenSSL_add_all_algorithms();
+    ERR_load_BIO_strings();
+    ERR_load_crypto_strings();
+
+    /* ---------------------------------------------------------- *
+    * Create the Input/Output BIO's.                             *
+    * ---------------------------------------------------------- */
+    certbio = BIO_new(BIO_s_file());
+    outbio  = BIO_new_fp(stdout, BIO_NOCLOSE);
+
+    /* ---------------------------------------------------------- *
+    * Load the certificate from file (PEM).                      *
+    * ---------------------------------------------------------- */
+    ret = BIO_read_filename(certbio, __cert.c_str());
+    if (! (cert = PEM_read_bio_X509(certbio, NULL, 0, NULL)))
+    {
+        BIO_printf(outbio, "Error loading cert into memory\n");
+        exit(-1);
+    }
+
+    /* ---------------------------------------------------------- *
+    * Extract the certificate's serial number.                   *
+    * ---------------------------------------------------------- */
+    asn1_serial = X509_get_serialNumber(cert);
+    if (asn1_serial == NULL)
+        BIO_printf(outbio, "Error getting serial number from certificate");
+
+    ASN1_TIME* _time = X509_get_notBefore(cert);
+    const char* s = (const char*)_time->data;
+    time_t time1 = ASN1_GetTimeT(_time);
+
+    /* ---------------------------------------------------------- *
+    * Print the serial number value, openssl x509 -serial style  *
+    * ---------------------------------------------------------- */
+    BIO_puts(outbio,"serial (openssl x509 -serial style): ");
+    i2a_ASN1_INTEGER(outbio, asn1_serial);
+    BIO_puts(outbio,"\n");
+
+    /* ---------------------------------------------------------- *
+    * Print the serial number value, openssl x509 -text style    *
+    * ---------------------------------------------------------- */
+    if (asn1_serial->length <= (int)sizeof(long))
+    {
+        l=ASN1_INTEGER_get(asn1_serial);
+        if (asn1_serial->type == V_ASN1_NEG_INTEGER)
+        {
+            l= -l;
+            neg="-";
+        }
+        else neg="";
+
+        if (BIO_printf(outbio," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
+            BIO_printf(outbio, "Error during printing the serial.\n");
+    }
+    else
+    {
+        neg=(asn1_serial->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
+        //if (BIO_printf(outbio,"\n%12s%s","",neg) <= 0)
+        if (BIO_printf(outbio,"serial (openssl x509 -text   style): %s","",neg) <= 0)
+            BIO_printf(outbio, "Error during printing the serial.\n");
+
+        for (i=0; i<asn1_serial->length; i++)
+        {
+            char c[2];
+            c[0] = asn1_serial->data[i];
+            c[1] = '0';
+            BIO_printf(outbio, c);
+        }
+    }
+
+    X509_free(cert);
+    BIO_free_all(certbio);
+    BIO_free_all(outbio);
+    exit(0);
+}
+#endif
+
+#if 0
+int main(int argc, char **argv)
+{
+    std::wstring sFolderW = NSFile::GetProcessDirectory();
+    std::string sFolder = U_TO_UTF8(sFolderW);
+    std::string __file = sFolder + "/settings.xml";
+    std::string __key = sFolder + "/rsakey.pem";
+    std::string __cert = sFolder + "/www.pfx";
+
+    std::string __export = sFolder + "/www.pem";
+
+    FILE *fp;
+    EVP_PKEY *pkey;
+    X509 *cert;
+    STACK_OF(X509) *ca = NULL;
+    PKCS12 *p12;
+
+    OpenSSL_add_all_algorithms();
+    ERR_load_crypto_strings();
+
+    if (!(fp = fopen(__cert.c_str(), "rb")))
+    {
+        fprintf(stderr, "Error opening file %s\n", __cert.c_str());
+        exit(1);
+    }
+    p12 = d2i_PKCS12_fp(fp, NULL);
+    fclose (fp);
+
+    if (!p12)
+    {
+        fprintf(stderr, "Error reading PKCS#12 file\n");
+        ERR_print_errors_fp(stderr);
+        exit (1);
+    }
+
+    if (!PKCS12_parse(p12, "111", &pkey, &cert, &ca))
+    {
+        fprintf(stderr, "Error parsing PKCS#12 file\n");
+        ERR_print_errors_fp(stderr);
+        exit (1);
+    }
+    PKCS12_free(p12);
+
+    if (!(fp = fopen(__export.c_str(), "w")))
+    {
+        fprintf(stderr, "Error opening file %s\n", argv[1]);
+        exit(1);
+    }
+    if (pkey)
+    {
+        fprintf(fp, "***Private Key***\n");
+        PEM_write_PrivateKey(fp, pkey, NULL, NULL, 0, NULL, NULL);
+    }
+    if (cert)
+    {
+        fprintf(fp, "***User Certificate***\n");
+        PEM_write_X509_AUX(fp, cert);
+    }
+    if (ca && sk_X509_num(ca))
+    {
+        fprintf(fp, "***Other Certificates***\n");
+        int count = sk_X509_num(ca);
+        for (int i = 0; i < count; i++)
+            PEM_write_X509_AUX(fp, sk_X509_value(ca, i));
+    }
+
+    sk_X509_pop_free(ca, X509_free);
+    X509_free(cert);
+    EVP_PKEY_free(pkey);
+
+    fclose(fp);
+    return 0;
+}
+#endif
+
+#if 0
+int main()
+{    
+    unsigned char ibuf[] = "compute sha1";
+    unsigned char obuf[20];
+
+    SHA1(ibuf, strlen((char*)ibuf), obuf);
+
+    int i;
+    for (i = 0; i < 20; i++) {
+        printf("%02x ", obuf[i]);
+    }
+    printf("\n");
+
+    return 0;
+}
+#endif
+
+#if 0
+int main()
+{
+    std::wstring sFolderW = NSFile::GetProcessDirectory();
+    std::string sFolder = U_TO_UTF8(sFolderW);
+    std::string __file = sFolder + "/settings.xml";
+
+#if 1
+    std::string __key = sFolder + "/www.pem";
+    std::string __cert = sFolder + "/www.pem";
+#else
+    std::string __key = sFolder + "/rsakey.pem";
+    std::string __cert = sFolder + "/rsacert.pem";
+#endif
+
+    OpenSSL_add_all_algorithms();
+    ERR_load_BIO_strings();
+    ERR_load_crypto_strings();
+
+    FILE* file_key = NSFile::CFileBinary::OpenFileNative(UTF8_TO_U(__key), L"r+");
+    FILE* file_cert = NSFile::CFileBinary::OpenFileNative(UTF8_TO_U(__key), L"r+");
+
+    EVP_PKEY* pKey = NULL;
+    PEM_read_PrivateKey(file_key, &pKey, NULL, NULL);
+
+    X509* pCert = NULL;
+    PEM_read_X509(file_cert, &pCert, NULL, NULL);
+
+    EVP_MD_CTX* pCtx = EVP_MD_CTX_create();
+    const EVP_MD* pDigest = EVP_sha1();
+
+    int n1 = EVP_SignInit(pCtx, pDigest);
+
+    BYTE* pDataSrc = NULL;
+    DWORD nDataSrcLen = 0;
+    NSFile::CFileBinary::ReadAllBytes(UTF8_TO_U(__file), &pDataSrc, nDataSrcLen);
+
+    int n2 = EVP_SignUpdate(pCtx, pDataSrc, (size_t)nDataSrcLen);
+
+    BYTE pSignature[4096];
+    unsigned int nSignatureLen = 0;
+
+    int n3 = EVP_SignFinal(pCtx, pSignature, &nSignatureLen, pKey);
+
+    RELEASEARRAYOBJECTS(pDataSrc);
+
+    EVP_PKEY_free(pKey);
+    X509_free(pCert);
+
+    EVP_MD_CTX_destroy(pCtx);
+
+    fclose(file_key);
+    fclose(file_cert);
+
+    return 0;
+}
+#endif

DesktopEditor/xmlsec/test/openssl_linux/test.pro

@@ -0,0 +1,24 @@
+QT       -= core gui
+
+TARGET = test
+TEMPLATE = app
+
+CONFIG   += console
+CONFIG   -= app_bundle
+
+DEFINES -= \
+    UNICODE \
+    _UNICODE
+
+CORE_ROOT_DIR = $$PWD/../../../..
+PWD_ROOT_DIR = $$PWD
+include($$CORE_ROOT_DIR/Common/base.pri)
+
+DEFINES += XMLSEC_OPENSSL_110
+
+INCLUDEPATH += $$PWD/../../openssl/include
+
+LIBS += -L$$PWD/../../openssl -lcrypto -lssl
+LIBS += -ldl
+
+SOURCES += main.cpp

DesktopEditor/xmlsec/test/windows/main.cpp

@@ -42,6 +42,8 @@
 #include <xmlsec/templates.h>
 #include <xmlsec/crypto.h>
 
+#include "../../../common/File.h"
+
 int sign_file(const char* xml_file, const char* key_file, const char* cert_file);
 
 int
@@ -50,13 +52,11 @@ main(int argc, char **argv) {
     xsltSecurityPrefsPtr xsltSecPrefs = NULL;
 #endif /* XMLSEC_NO_XSLT */
 
-    assert(argv);
-
-    if(argc != 4) {
-        fprintf(stderr, "Error: wrong number of arguments.\n");
-        fprintf(stderr, "Usage: %s <xml-file> <key-file> <cert-file>\n", argv[0]);
-        return(1);
-    }
+    std::wstring sFolderW = NSFile::GetProcessDirectory();
+    std::string sFolder = U_TO_UTF8(sFolderW);
+    std::string __file = sFolder + "/settings.xml";
+    std::string __key = sFolder + "/rsakey.pem";
+    std::string __cert = sFolder + "/rsacert.pem";
 
     /* Init libxml and libxslt libraries */
     xmlInitParser();
@@ -117,7 +117,7 @@ main(int argc, char **argv) {
         return(-1);
     }
 
-    if(sign_file(argv[1], argv[2], argv[3]) < 0) {
+    if(sign_file(__file.c_str(), __key.c_str(), __cert.c_str()) < 0) {
         return(-1);
     }
 

DesktopEditor/xmlsec/test/windows/test.pro

@@ -15,7 +15,7 @@ PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 
 #DEFINES += XMLSEC_CRYPTO_DYNAMIC_LOADING
-DEFINES += XMLSEC_CRYPTO_MSCRYPTO
+DEFINES += XMLSEC_CRYPTO_OPENSSL
 
 INCLUDEPATH += \
     $$CORE_ROOT_DIR/DesktopEditor/xml/libxml2/include \
@@ -40,8 +40,8 @@ DEFINES += XMLSEC_STATIC
 
 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -llibxmlsec
 
-LIBS += -lcrypt32
-LIBS += -lcryptui
-LIBS += -lAdvapi32
+LIBS += -L$$PWD/../../openssl -lcrypto -lssl
+
+LIBS += -ldl
 
 SOURCES += main.cpp

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

@@ -177,34 +177,40 @@ void CorrectHashSize(_buf & hashBuf, int size, unsigned char padding)
 }
 _buf Hmac(_buf &  buf, CRYPT_METHOD::_hashAlgorithm algorithm, std::string & plain)
 {
+	std::string mac;
 	if (algorithm == CRYPT_METHOD::SHA1)
 	{
 		CryptoPP::HMAC<CryptoPP::SHA1> hmac(buf.ptr, buf.size);
-
-		//return _buf(mac.BytePtr(), mac.SizeInBytes());
-	}
-	else if (algorithm == CRYPT_METHOD::SHA256)
-	{
-		CryptoPP::HMAC<CryptoPP::SHA256> hmac(buf.ptr, buf.size);
-
-		//return _buf(mac.BytePtr(), mac.SizeInBytes());
-	}
-	else if (algorithm == CRYPT_METHOD::SHA512)
-	{
-		CryptoPP::HMAC<CryptoPP::SHA512> hmac(buf.ptr, buf.size);
-		
-		std::string mac;
 		CryptoPP::StringSource(plain, true, 
 					new CryptoPP::HashFilter(hmac,
 						new CryptoPP::StringSink(mac)
 					) // HashFilter      
 				); // StringSource
 
-		return _buf(mac);
+	}
+	else if (algorithm == CRYPT_METHOD::SHA256)
+	{
+		CryptoPP::HMAC<CryptoPP::SHA256> hmac(buf.ptr, buf.size);
+		CryptoPP::StringSource(plain, true, 
+					new CryptoPP::HashFilter(hmac,
+						new CryptoPP::StringSink(mac)
+					) // HashFilter      
+				); // StringSource
 
 	}
-	//else
-		return _buf();
+	else if (algorithm == CRYPT_METHOD::SHA512)
+	{
+		CryptoPP::HMAC<CryptoPP::SHA512> hmac(buf.ptr, buf.size);
+		
+		CryptoPP::StringSource(plain, true, 
+					new CryptoPP::HashFilter(hmac,
+						new CryptoPP::StringSink(mac)
+					) // HashFilter      
+				); // StringSource
+
+	}
+	
+	return _buf(mac);
 }
 
 
@@ -488,8 +494,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);	
@@ -514,15 +522,15 @@ bool ECMADecryptor::IsDataIntegrity(unsigned char* data, int  size)
 	_buf iv2 = HashAppend(pDataSalt, pBlockHmacValue, cryptData.hashAlgorithm);
 	CorrectHashSize(iv2, cryptData.blockSize, 0x36);
 
-	_buf salt;
-	DecryptCipher(secretKey,  iv1, pEncHmacKey, salt, cryptData.cipherAlgorithm);
+	_buf pSaltHmac;
+	DecryptCipher(secretKey,  iv1, pEncHmacKey, pSaltHmac, cryptData.cipherAlgorithm);
 	
 	_buf expected;
 	DecryptCipher(secretKey,  iv2, pEncHmacValue, expected, cryptData.cipherAlgorithm);
 
 	std::string sData((char*)data, size);
-	_buf hmac = Hmac(salt, cryptData.hashAlgorithm, sData);
-	
+	_buf hmac = Hmac(pSaltHmac, cryptData.hashAlgorithm, sData);
+		
 	return (hmac == expected);
 }
 void ECMADecryptor::Decrypt(unsigned char* data_ptr, int  data_size, unsigned char*& data_out)
@@ -540,8 +548,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 +609,7 @@ void ECMADecryptor::Decrypt(unsigned char* data_ptr, int  data_size, unsigned ch
 		DecryptCipher(hashKey, empty, pInp, pOut, cryptData.cipherAlgorithm);
 	}
 }
+
 //-----------------------------------------------------------------------------------------------------------
 ECMAEncryptor::ECMAEncryptor()
 {
@@ -611,6 +618,65 @@ ECMAEncryptor::ECMAEncryptor()
 void ECMAEncryptor::SetPassword(std::wstring _password)
 {
 	password = _password;
+
+//---------
+	CryptoPP::RandomPool prng;
+	
+	//сгенерить соль
+	CryptoPP::SecByteBlock seed_salt(cryptData.saltSize);
+	CryptoPP::OS_GenerateRandomBlock(false, seed_salt, seed_salt.size());
+	prng.IncorporateEntropy(seed_salt, seed_salt.size());
+	
+	CryptoPP::SecByteBlock seed_datasalt(cryptData.saltSize);
+	CryptoPP::OS_GenerateRandomBlock(false, seed_datasalt, seed_datasalt.size());
+	prng.IncorporateEntropy(seed_datasalt, seed_datasalt.size());
+
+	//сгенерить ключ
+	CryptoPP::SecByteBlock seed_key(cryptData.keySize);
+	CryptoPP::OS_GenerateRandomBlock(false, seed_key, seed_key.size());
+	prng.IncorporateEntropy(seed_key, seed_key.size());
+
+	//сгенерить проверочный
+	CryptoPP::SecByteBlock seed_verify(cryptData.saltSize);
+	CryptoPP::OS_GenerateRandomBlock(false, seed_verify, seed_verify.size());
+	prng.IncorporateEntropy(seed_verify, seed_verify.size());
+//---------
+	_buf pPassword		(password);
+	_buf empty			(NULL, 0, false);
+	
+	_buf pBlockKey		((unsigned char*)encrKeyValueBlockKey, 8);	
+	_buf pInputBlockKey ((unsigned char*)encrVerifierHashInputBlockKey, 8);
+	_buf pValueBlockKey ((unsigned char*)encrVerifierHashValueBlockKey, 8);
+	
+	_buf pSalt			(seed_salt.m_ptr, seed_salt.m_size);
+	_buf pDataSalt		(seed_datasalt.m_ptr, seed_datasalt.m_size);
+	_buf pDecryptedKey	(seed_key.m_ptr, seed_key.m_size);
+	
+//------------------------------------------------------------------------------------------------
+	_buf agileKey = GenerateAgileKey( pSalt, pPassword, pBlockKey, cryptData.keySize, cryptData.spinCount, cryptData.hashAlgorithm);  
+
+	_buf pKeyValue;
+	EncryptCipher( agileKey, pSalt, pDecryptedKey, pKeyValue, cryptData.cipherAlgorithm);  
+	
+//--------------------------------------------
+	_buf decryptedVerifierHashInputBytes(seed_verify.m_ptr, seed_verify.m_size);
+	_buf verifierInputKey = GenerateAgileKey( pSalt, pPassword, pInputBlockKey, cryptData.keySize, cryptData.spinCount, cryptData.hashAlgorithm );
+	
+	_buf pEncVerInput;
+	EncryptCipher( verifierInputKey, pSalt, decryptedVerifierHashInputBytes, pEncVerInput, cryptData.cipherAlgorithm);  
+//--------------------------------------------
+
+	_buf decryptedVerifierHashBytes = HashAppend(decryptedVerifierHashInputBytes, empty, cryptData.hashAlgorithm);
+	_buf verifierHashKey = GenerateAgileKey(pSalt, pPassword, pValueBlockKey, cryptData.keySize, cryptData.spinCount, cryptData.hashAlgorithm);
+	
+	_buf pEncVerValue;
+	EncryptCipher( verifierHashKey, pSalt, decryptedVerifierHashBytes, pEncVerValue, cryptData.cipherAlgorithm);  
+
+	cryptData.saltValue					= std::string((char*)pSalt.ptr, pSalt.size);
+	cryptData.dataSaltValue				= std::string((char*)pDataSalt.ptr, pDataSalt.size);
+	cryptData.encryptedKeyValue			= std::string((char*)pKeyValue.ptr, pKeyValue.size);
+	cryptData.encryptedVerifierInput	= std::string((char*)pEncVerInput.ptr, pEncVerInput.size);
+	cryptData.encryptedVerifierValue	= std::string((char*)pEncVerValue.ptr, pEncVerValue.size);
 }
 
 void ECMAEncryptor::SetCryptData(_ecmaCryptData	& data)
@@ -622,6 +688,7 @@ void ECMAEncryptor::GetCryptData(_ecmaCryptData &data)
 {
 	data = cryptData;
 }
+
 void ECMAEncryptor::UpdateDataIntegrity(unsigned char* data, int  size)
 {
 	if (cryptData.bAgile == false) return;
@@ -636,31 +703,41 @@ 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);
+//----
+	CryptoPP::RandomPool prng;
+	CryptoPP::SecByteBlock seed(cryptData.hashSize);
+
+	CryptoPP::OS_GenerateRandomBlock(false, seed, seed.size());
+	prng.IncorporateEntropy(seed, seed.size());
 	
-	_buf expected;
-	DecryptCipher(secretKey,  iv2, pEncHmacValue, expected, cryptData.cipherAlgorithm);
+	_buf pSaltHmac(seed.m_ptr, seed.m_size);
 
 	std::string sData((char*)data, size);
-	_buf hmac = Hmac(salt, cryptData.hashAlgorithm, sData);
-	
-	//return (hmac == expected);
+	_buf hmac = Hmac(pSaltHmac, cryptData.hashAlgorithm, sData);
+
+	_buf pEncHmacKey;
+	EncryptCipher(secretKey,  iv1, pSaltHmac, 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;
@@ -686,19 +763,17 @@ int ECMAEncryptor::Encrypt(unsigned char* data_inp_ptr, int size, unsigned char*
 	_buf pKeyValue	(cryptData.encryptedKeyValue);
 	
 //------------------------------------------------------------------------------------------------
-	//соль нужно сгенерить
-
 	_buf agileKey = GenerateAgileKey( pSalt, pPassword, pBlockKey, cryptData.keySize, cryptData.spinCount, cryptData.hashAlgorithm);  
 
 	//тут нужно именно дешифрованый генерить  - пока их файла берем
 	_buf pDecryptedKey;
 	DecryptCipher( agileKey, pSalt, pKeyValue, pDecryptedKey, cryptData.cipherAlgorithm);  
 
-	//зашифровать ключь
-	_buf pEncryptedKey;
-	EncryptCipher( agileKey, pSalt, pDecryptedKey, pEncryptedKey, cryptData.cipherAlgorithm);  
+	////зашифровать ключь
+	//_buf pEncryptedKey;
+	//EncryptCipher( agileKey, pSalt, pDecryptedKey, pEncryptedKey, cryptData.cipherAlgorithm);  
 
-	//??? pEncryptedKey == pKeyValue;
+	////??? pEncryptedKey == pKeyValue;
 
 //-------------------------------------------------------------------------------------------------
 	_buf iv(cryptData.blockSize);

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

@@ -42,7 +42,7 @@
 #include "../../ASCOfficeDocFile/DocDocxConverter/MemoryStream.h"
 #include "simple_xml_writer.h"
 
-CRYPT::_ecmaCryptData cryptDataGlobal;
+//CRYPT::_ecmaCryptData cryptDataGlobal; for Test
 
 using namespace CRYPT;
 
@@ -489,19 +489,19 @@ bool ECMACryptFile::EncryptOfficeFile(std::wstring file_name_inp, std::wstring f
 	_ecmaCryptData cryptData;
 	
 	cryptData.bAgile		= true;
-	cryptData.hashAlgorithm = CRYPT_METHOD::SHA256;
+	cryptData.hashAlgorithm = CRYPT_METHOD::SHA512;
 	cryptData.keySize		= 0x20;
 	cryptData.hashSize		= 0x40;
 	cryptData.blockSize		= 0x10;
 	cryptData.saltSize		= 0x10;
 
 	ECMAEncryptor cryptor;	
+
+	//cryptor.SetCryptData(cryptDataGlobal);	//for test !!! 
+	cryptor.SetCryptData(cryptData);			//basic settings
 	
 	cryptor.SetPassword(password);
 
-	cryptor.SetCryptData(cryptDataGlobal);	//for test !!! 
-	//cryptor.SetCryptData(cryptData);		//basic settings
-
 	NSFile::CFileBinary file;
 	if (!file.OpenFile(file_name_inp)) return false;
 
@@ -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 & test
 
 	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

Test/Applications/ParseAllCultureInfo/ParseAllCultureInfo/Parser.cs

@@ -138,22 +138,158 @@ namespace ParseAllCultureInfo
                 {
                     var index = aTemp[i];
                     if(nIndexD == index)
-                        sShortDatePattern += "0";
-                    else if (nIndexM == index)
-                        sShortDatePattern += "1";
+                    {
+                        if (nIndexD + 1 < ShortDatePatternLower.Length && 'd' == ShortDatePatternLower[nIndexD + 1])
+                        {
+                            sShortDatePattern += "1";
+                        }
+                        else
+                        {
+                            sShortDatePattern += "0";
+                        }
+                    } else if (nIndexM == index)
+                    {
+                        if (nIndexM + 1 < ShortDatePatternLower.Length && 'm' == ShortDatePatternLower[nIndexM + 1])
+                        {
+                            sShortDatePattern += "3";
+                        }
+                        else
+                        {
+                            sShortDatePattern += "2";
+                        }
+                    }
                     else if (nIndexY == index)
-                        sShortDatePattern += "2";
+                    {
+                        if (nIndexY + 2 < ShortDatePatternLower.Length && 'y' == ShortDatePatternLower[nIndexY + 2])
+                        {
+                            sShortDatePattern += "5";
+                        }
+                        else
+                        {
+                            sShortDatePattern += "4";
+                        }
+                    }
                 }
                 ShortDatePattern = sShortDatePattern;
             }
         }
+        static Dictionary<int, int> g_mapUsedValues = new Dictionary<int, int>() {
+            {4, 1},
+            {5, 1},
+            {7, 1},
+            {8, 1},
+            {9, 1},
+            {10, 1},
+            {11, 1},
+            {12, 1},
+            {16, 1},
+            {17, 1},
+            {18, 1},
+            {21, 1},
+            {22, 1},
+            {25, 1},
+            {31, 1},
+            {34, 1},
+            {36, 1},
+            {38, 1},
+            {42, 1},
+            {44, 1},
+            {1028, 1},
+            {1029, 1},
+            {1031, 1},
+            {1032, 1},
+            {1033, 1},
+            {1035, 1},
+            {1036, 1},
+            {1040, 1},
+            {1041, 1},
+            {1042, 1},
+            {1045, 1},
+            {1046, 1},
+            {1049, 1},
+            {1055, 1},
+            {1058, 1},
+            {1060, 1},
+            {1062, 1},
+            {1066, 1},
+            {1068, 1},
+            {2052, 1},
+            {2055, 1},
+            {2057, 1},
+            {2058, 1},
+            {2060, 1},
+            {2064, 1},
+            {2070, 1},
+            {2073, 1},
+            {2092, 1},
+            {3076, 1},
+            {3079, 1},
+            {3081, 1},
+            {3082, 1},
+            {3084, 1},
+            {4100, 1},
+            {4103, 1},
+            {4105, 1},
+            {4106, 1},
+            {4108, 1},
+            {5124, 1},
+            {5127, 1},
+            {5129, 1},
+            {5130, 1},
+            {5132, 1},
+            {6153, 1},
+            {6154, 1},
+            {6156, 1},
+            {7177, 1},
+            {7178, 1},
+            {7180, 1},
+            {8201, 1},
+            {8202, 1},
+            {8204, 1},
+            {9225, 1},
+            {9226, 1},
+            {9228, 1},
+            {10249, 1},
+            {10250, 1},
+            {10252, 1},
+            {11273, 1},
+            {11274, 1},
+            {11276, 1},
+            {12297, 1},
+            {12298, 1},
+            {12300, 1},
+            {13321, 1},
+            {13322, 1},
+            {13324, 1},
+            {14345, 1},
+            {14346, 1},
+            {14348, 1},
+            {15369, 1},
+            {15370, 1},
+            {15372, 1},
+            {16393, 1},
+            {16394, 1},
+            {17417, 1},
+            {17418, 1},
+            {18441, 1},
+            {18442, 1},
+            {19466, 1},
+            {20490, 1},
+            {21514, 1},
+            {22538, 1},
+            {23562, 1},
+            {29740, 1},
+            {30724, 1},
+            {30764, 1},
+            {31748, 1}
+        };
         public static void parse()
         {
             List<int> aLcid = new List<int>();
             Dictionary<int, CultureInfo> aInfos = new Dictionary<int, CultureInfo>();
             foreach (CultureInfo ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
             {
-                if (!aInfos.ContainsKey(ci.LCID))
+                if (!aInfos.ContainsKey(ci.LCID) && g_mapUsedValues.ContainsKey(ci.LCID))
                 {
                     aLcid.Add(ci.LCID);
                     aInfos[ci.LCID] = ci;

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.4.463.0
+VERSION = 2.4.464.0
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t

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))
@@ -1500,6 +1514,19 @@ namespace NExtractTools
 		}
 		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
+	int oox2mscrypt	 (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+        std::wstring password = params.getPassword();
+
+		ECMACryptFile cryptReader;
+
+        if (cryptReader.EncryptOfficeFile(sFrom, sTo, password) == false)
+		{
+			return AVS_FILEUTILS_ERROR_CONVERT;
+		}
+
+		return S_OK;
+	}
     int fromMscrypt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
 	{
         std::wstring password = params.getPassword();
@@ -1556,7 +1583,7 @@ namespace NExtractTools
         }
         return nRes;
 	}
-	//html
+ 	//html
 	int html2doct_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
    {
        std::vector<std::wstring> arFiles;
@@ -1908,7 +1935,19 @@ namespace NExtractTools
        {
            if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatTo)
            {
-               nRes = dir2zip(sFrom, sTo);
+				if(params.hasPassword())
+				{
+					std::wstring sToMscrypt = sTemp + FILE_SEPARATOR_STR + _T("tomscrypt.docx");
+					nRes = dir2zip(sFrom, sToMscrypt);
+					if(SUCCEEDED_X2T(nRes))
+					{
+						nRes = oox2mscrypt(sToMscrypt, sTo, sTemp, params);
+					}
+				}
+				else
+				{
+					nRes = dir2zip(sFrom, sTo);
+				}
            }
            else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC == nFormatTo)
            {
@@ -2077,7 +2116,19 @@ namespace NExtractTools
        {
            if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX == nFormatTo)
            {
-               nRes = dir2zip(sFrom, sTo);
+				if(params.hasPassword())
+				{
+					std::wstring sToMscrypt = sTemp + FILE_SEPARATOR_STR + _T("tomscrypt.xlsx");
+					nRes = dir2zip(sFrom, sToMscrypt);
+					if(SUCCEEDED_X2T(nRes))
+					{
+						nRes = oox2mscrypt(sToMscrypt, sTo, sTemp, params);
+					}
+				}
+				else
+				{
+					nRes = dir2zip(sFrom, sTo);
+				}
            }
            //else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLS == nFormatTo)
            else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS == nFormatTo)
@@ -2219,7 +2270,19 @@ namespace NExtractTools
 		{
 			if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX == nFormatTo)
 			{
-				nRes = dir2zip(sFrom, sTo);
+				if(params.hasPassword())
+				{
+					std::wstring sToMscrypt = sTemp + FILE_SEPARATOR_STR + _T("tomscrypt.pptx");
+					nRes = dir2zip(sFrom, sToMscrypt);
+					if(SUCCEEDED_X2T(nRes))
+					{
+						nRes = oox2mscrypt(sToMscrypt, sTo, sTemp, params);
+					}
+				}
+				else
+				{
+					nRes = dir2zip(sFrom, sTo);
+				}
 			}
 			//else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT == nFormatTo)
 			else if(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP == nFormatTo)
@@ -2494,7 +2557,54 @@ namespace NExtractTools
         }
         return AVS_FILEUTILS_ERROR_CONVERT;
    }
+	int html2doct_bin(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+		std::wstring sResultDoctDir = NSFile::GetDirectoryName(sTo);
 
+        int nRes = html2doct_dir(sFrom, sResultDoctDir, sTemp, params);
+		
+		return nRes;
+	}
+	int html2doct(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+        std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
+        std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
+
+        NSDirectory::CreateDirectory(sResultDoctDir);
+
+        int nRes = html2doct_dir(sFrom, sResultDoctDir, sTemp, params);
+
+        if (SUCCEEDED_X2T(nRes))
+        {
+            COfficeUtils oCOfficeUtils(NULL);
+            nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+        }
+		return nRes;
+	}
+    int html2docx(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
+	{
+        std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
+        std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
+
+        NSDirectory::CreateDirectory(sResultDoctDir);
+
+        int nRes = html2doct_dir(sFrom, sResultDoctDir, sTemp, params);
+        if (SUCCEEDED_X2T(nRes))
+		{
+			std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked");
+			NSDirectory::CreateDirectory(sDocxDir);
+
+			nRes = doct_bin2docx_dir(sResultDoctFileEditor, L"", sDocxDir, false, L"", params);
+			if (SUCCEEDED_X2T(nRes))
+			{
+				COfficeUtils oCOfficeUtils(NULL);
+				nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sDocxDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+			}
+		}
+		return nRes;
+	}
+
+//------------------------------------------------------------------------------------------------------------------
 	int fromInputParams(InputParams& oInputParams)
 	{
 		TConversionDirection conversion  = oInputParams.getConversionDirection();
@@ -2801,6 +2911,26 @@ namespace NExtractTools
 				result =  mscrypt2oot_bin (sFileFrom, sFileTo, sTempDir, oInputParams);
 			{
 			}break;
+			case TCD_HTML2DOCX:
+			{
+				result = html2docx (sFileFrom, sFileTo, sTempDir, oInputParams);
+			}break;
+			case TCD_HTML2DOCT:
+			{
+				result = html2doct (sFileFrom, sFileTo, sTempDir, oInputParams);
+			}break;
+			case TCD_HTML2DOCT_BIN:
+			{
+				result = html2doct_bin (sFileFrom, sFileTo, sTempDir, oInputParams);
+			}break;
+			
+			//TCD_FB22DOCX,
+			//TCD_FB22DOCT,
+			//TCD_FB22DOCT_BIN,
+
+			//TCD_EPUB2DOCX,
+			//TCD_EPUB2DOCT,
+			//TCD_EPUB2DOCT_BIN,
 		}
 
 		// delete temp dir

X2tConverter/src/ASCConverters.h

@@ -128,6 +128,12 @@ namespace NExtractTools
 	int mscrypt2oox		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 	int mscrypt2oot		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 	int mscrypt2oot_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	
+	int oox2mscrypt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+
+	int html2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	int html2doct		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    int html2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------
     int dir2zip			(const std::wstring &sFrom, const std::wstring &sTo);

X2tConverter/src/cextracttools.cpp

@@ -223,6 +223,24 @@ namespace NExtractTools
                         else if (0 == sExt2.compare(_T(".pptt")))		res = TCD_MSCRYPT2PPTT;
  						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_MSCRYPT2BIN;
 					}break;
+				case AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML:
+					{
+							 if (0 == sExt2.compare(_T(".docx")))		res = TCD_HTML2DOCX;
+						else if (0 == sExt2.compare(_T(".doct")))		res = TCD_HTML2DOCT;
+						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_HTML2DOCT_BIN;
+					}break;
+				case AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2:
+					{
+							 if (0 == sExt2.compare(_T(".docx")))		res = TCD_FB22DOCX;
+						else if (0 == sExt2.compare(_T(".doct")))		res = TCD_FB22DOCT;
+						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_FB22DOCT_BIN;
+					}break;
+				case AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB:
+					{
+							 if (0 == sExt2.compare(_T(".docx")))		res = TCD_EPUB2DOCX;
+						else if (0 == sExt2.compare(_T(".doct")))		res = TCD_EPUB2DOCT;
+						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_EPUB2DOCT_BIN;
+					}break;
                 }
             }
 		}

X2tConverter/src/cextracttools.h

@@ -136,7 +136,7 @@ namespace NExtractTools
         TCD_PPTT2ODP,
         TCD_PPTX_BIN2ODP,
 		
-		TCD_XML2DOCX,
+	TCD_XML2DOCX,
         TCD_DOCX2XML,
 //
 		TCD_MSCRYPT2,
@@ -145,6 +145,18 @@ namespace NExtractTools
 		TCD_MSCRYPT2PPTT,
 		TCD_MSCRYPT2BIN,
 //
+		TCD_HTML2DOCX,
+		TCD_HTML2DOCT,
+		TCD_HTML2DOCT_BIN,
+		
+		TCD_FB22DOCX,
+		TCD_FB22DOCT,
+		TCD_FB22DOCT_BIN,
+
+		TCD_EPUB2DOCX,
+		TCD_EPUB2DOCT,
+		TCD_EPUB2DOCT_BIN,
+
         TCD_MAILMERGE,
         TCD_T2,
         TCD_DOCT_BIN2,
@@ -499,6 +511,10 @@ namespace NExtractTools
 			}
 			return true;
 		}
+		bool hasPassword() const
+		{
+			return NULL != m_sPassword;
+		}
 		std::wstring getPassword() const
         {
             return (NULL != m_sPassword) ? (*m_sPassword) : L"";
@@ -544,7 +560,7 @@ namespace NExtractTools
             }
             sRes  = L"<xmlOptions><fileOptions fileType='" + std::to_wstring(nFileType);
             sRes += L"' codePage='" + std::to_wstring(nCsvEncoding);
-			sRes += L"' delimiter='" + XmlUtils::EncodeXmlString(cDelimiter) + L"' " + sSaveType;
+			sRes += L"' delimiter='" + XmlUtils::EncodeXmlStringExtend(cDelimiter) + L"' " + sSaveType;
             sRes += L"/><TXTOptions><Encoding>" + std::to_wstring(nCsvEncoding) + L"</Encoding></TXTOptions></xmlOptions>";
 
             return sRes;

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -2686,10 +2686,11 @@ namespace BinXlsxRW
 
 							if (olePic->oleObject->m_OleObjectFile.IsInit())
 							{
-								//if (olePic->oleObject->m_OleObjectFile->isMsPackage() == false)
 								olePic->blipFill.blip->oleFilepathBin = olePic->oleObject->m_OleObjectFile->filename().GetPath();
 							}
 						}
+						OOX::Image*		pImageFileCache = NULL;
+						std::wstring	sIdImageFileCache;
 						if ((NULL != pShapeElem) && (OOX::et_v_shapetype != pShapeElem->getType()))
 						{
 							OOX::Vml::CShape* pShape = static_cast<OOX::Vml::CShape*>(pShapeElem);
@@ -2704,26 +2705,43 @@ namespace BinXlsxRW
 								if(OOX::et_v_imagedata == pChildElemShape->getType())
 								{
 									OOX::Vml::CImageData* pImageData = static_cast<OOX::Vml::CImageData*>(pChildElemShape);									
-															
-									if (pImageData->m_oRelId.IsInit())
+														
+									if (pImageData->m_oRelId.IsInit())		sIdImageFileCache = pImageData->m_oRelId->GetValue();
+									else if (pImageData->m_rId.IsInit())	sIdImageFileCache = pImageData->m_rId->GetValue();
+																		
+									if (!sIdImageFileCache.empty())
 									{
-										olePic->blipFill.blip->embed = new OOX::RId(pImageData->m_oRelId->GetValue()); 
-									//ищем физический файл ( rId относительно vml_drawing)
-										smart_ptr<OOX::File> pFile = pVmlDrawing->Find(olePic->blipFill.blip->embed.get());
+										//ищем физический файл ( rId относительно vml_drawing)									
+										smart_ptr<OOX::File> pFile = pVmlDrawing->Find(sIdImageFileCache);
 										
 										if (pFile.IsInit() && (	OOX::FileTypes::Image == pFile->type()))
 										{
-											OOX::Image* pImageFile = static_cast<OOX::Image*>(pFile.operator->());
-
-                                            OOX::CPath pathImage = pImageFile->filename();
-                                            olePic->oleObject->m_OleObjectFile->set_filename_cache(pathImage);
-											olePic->blipFill.blip->oleFilepathImage = pImageFile->filename().GetPath();
+											pImageFileCache = static_cast<OOX::Image*>(pFile.operator->());
 										}
-									}
+ 									}
 								}
 							}	
 						}
 						
+						if (pImageFileCache == NULL && pOleObject->m_oObjectPr.IsInit() && pOleObject->m_oObjectPr->m_oRid.IsInit())
+						{
+							sIdImageFileCache = pOleObject->m_oObjectPr->m_oRid->GetValue();
+							
+							smart_ptr<OOX::File> pFile = oWorksheet.Find(sIdImageFileCache);
+							if (pFile.IsInit() && (	OOX::FileTypes::Image == pFile->type()))
+							{
+								pImageFileCache = static_cast<OOX::Image*>(pFile.operator->());
+							}
+						}
+						if (pImageFileCache)
+						{
+							OOX::CPath pathImage = pImageFileCache->filename();
+
+                            olePic->oleObject->m_OleObjectFile->set_filename_cache(pathImage);
+							
+							olePic->blipFill.blip->embed = new OOX::RId(sIdImageFileCache); //ваще то тут не важно что - приоритет у того что ниже..
+							olePic->blipFill.blip->oleFilepathImage = pathImage.GetPath();
+						}
 
 						pCellAnchor->m_oElement = new PPTX::Logic::SpTreeElem();
 						pCellAnchor->m_oElement->InitElem(olePic);

XlsxSerializerCom/Writer/BinaryReader.h

@@ -2766,7 +2766,7 @@ namespace BinXlsxRW {
 				res = Read1(length, &BinaryWorksheetsTableReader::ReadDrawing, this, pCellAnchor);
 				
 				pCellAnchor->m_bShapeOle = false;
-				if (pCellAnchor->m_oElement->is<PPTX::Logic::Pic>())
+				if (pCellAnchor->m_oElement.is_init() && pCellAnchor->m_oElement->is<PPTX::Logic::Pic>())
 				{
 					PPTX::Logic::Pic& oPic = pCellAnchor->m_oElement->as<PPTX::Logic::Pic>();
 					if(oPic.oleObject.IsInit() && oPic.oleObject->m_OleObjectFile.IsInit())
@@ -2825,24 +2825,29 @@ namespace BinXlsxRW {
 								m_pCurVmlDrawing->m_lObjectIdVML = oWriter.m_lObjectIdVML;
 
 								pOleObject->m_oShapeId = *oPic.oleObject->m_sShapeId;
-						//add image rels to VmlDrawing
-                                OOX::CPath pathImageCache = pOleObject->m_OleObjectFile->filename_cache();
-
-                                NSCommon::smart_ptr<OOX::Image> pImageFileVml(new OOX::Image(false));
-                                pImageFileVml->set_filename(pathImageCache);
+                               
+								OOX::CPath pathImageCache = pOleObject->m_OleObjectFile->filename_cache();
+								smart_ptr<OOX::RId> oRIdImg;
 								
-                                smart_ptr<OOX::File> pFileVml = pImageFileVml.smart_dynamic_cast<OOX::File>();
-                                m_pCurVmlDrawing->Add(*oPic.blipFill.blip->embed, pFileVml);
+								if (pathImageCache.GetPath().empty() == false)
+								{
+								//add image rels to VmlDrawing
+									NSCommon::smart_ptr<OOX::Image> pImageFileVml(new OOX::Image(false));
+									pImageFileVml->set_filename(pathImageCache);
+									
+									smart_ptr<OOX::File> pFileVml = pImageFileVml.smart_dynamic_cast<OOX::File>();
+									m_pCurVmlDrawing->Add(*oPic.blipFill.blip->embed, pFileVml);
+						
+								//add image rels to Worksheet
+									NSCommon::smart_ptr<OOX::Image> pImageFileWorksheet(new OOX::Image(false));
 
-						//add image rels to Worksheet
-								NSCommon::smart_ptr<OOX::Image> pImageFileWorksheet(new OOX::Image(false));
-
-                                pImageFileWorksheet->set_filename(pathImageCache);
-								
-                                smart_ptr<OOX::File> pFileWorksheet = pImageFileWorksheet.smart_dynamic_cast<OOX::File>();
-                                const OOX::RId oRIdImg = m_pCurWorksheet->Add(pFileWorksheet);
-
-						//add oleObject rels
+									pImageFileWorksheet->set_filename(pathImageCache);
+									
+									smart_ptr<OOX::File> pFileWorksheet = pImageFileWorksheet.smart_dynamic_cast<OOX::File>();
+									
+									oRIdImg = new OOX::RId(m_pCurWorksheet->Add(pFileWorksheet));
+								}
+							//add oleObject rels
 								if(!m_pCurWorksheet->m_oOleObjects.IsInit())
 								{
 									m_pCurWorksheet->m_oOleObjects.Init();
@@ -2861,7 +2866,10 @@ namespace BinXlsxRW {
 								pOleObject->m_oObjectPr->m_oDefaultSize.Init();
 								pOleObject->m_oObjectPr->m_oDefaultSize->FromBool(false);
 								pOleObject->m_oObjectPr->m_oRid.Init();
-								pOleObject->m_oObjectPr->m_oRid->SetValue(oRIdImg.get());
+								
+								if (oRIdImg.IsInit())
+									pOleObject->m_oObjectPr->m_oRid->SetValue(oRIdImg->get());
+
 								pOleObject->m_oObjectPr->m_oAnchor.Init();
 								
 								SimpleTypes::Spreadsheet::ECellAnchorType eAnchorType = pCellAnchor->m_oAnchorType.GetValue();