Develop generating doc password

Common/3dParty/html/css/CssCalculator.pri

@@ -3,8 +3,6 @@ DEPENDPATH += $$PWD
 
 CORE_ROOT_DIR = $$PWD/../../../..
 
-include($$CORE_ROOT_DIR/Common/3dParty/boost/boost.pri)
-
 css_calculator_without_xhtml {
 	HEADERS += \
 		$$PWD/src/CCssCalculator_Private.h \

Common/3dParty/html/css/src/StyleProperties.h

@@ -4,14 +4,11 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <sstream>
 
 #include "../../../../DesktopEditor/graphics/Matrix.h"
 #include "CUnitMeasureConverter.h"
 
-#include <boost/optional.hpp>
-#include "boost/blank.hpp"
-#include <boost/variant2/variant.hpp>
-
 namespace NSCSS
 {
 	namespace NSProperties
@@ -19,34 +16,33 @@ namespace NSCSS
 	#define NEXT_LEVEL UINT_MAX, true
 
 	template<typename T>
-	class CValueBase
+	class CValue
 	{
-	protected:
-		CValueBase()
-			: m_unLevel(0), m_bImportant(false)
-		{}
-		CValueBase(const CValueBase& oValue)
-			: m_oValue(oValue.m_oValue), m_unLevel(oValue.m_unLevel), m_bImportant(oValue.m_bImportant)
-		{}
-
-		CValueBase(const T& oValue, unsigned int unLevel, bool bImportant)
-		    : m_oValue(oValue), m_unLevel(unLevel), m_bImportant(bImportant)
-		{}
+		friend class CString;
+		friend class CMatrix;
+		friend class CDigit;
+		friend class CColor;
+		friend class CEnum;
+		friend class CURL;
 
 		T            m_oValue;
 		unsigned int m_unLevel;
 		bool         m_bImportant;
 	public:
-		virtual bool Empty() const = 0;
-		virtual void Clear() = 0;
+		CValue(const T& oValue, unsigned int unLevel, bool bImportant) :
+		    m_oValue(oValue), m_unLevel(unLevel), m_bImportant(bImportant)
+		{
+		}
 
 		virtual bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) = 0;
 
+		virtual bool Empty() const = 0;
+		virtual void Clear() = 0;
 		virtual int ToInt() const = 0;
 		virtual double ToDouble() const = 0;
 		virtual std::wstring ToWString() const = 0;
 
-		static void Equation(CValueBase &oFirstValue, CValueBase &oSecondValue)
+		static void Equation(CValue &oFirstValue, CValue &oSecondValue)
 		{
 			if (oFirstValue.m_bImportant && !oSecondValue.m_bImportant && oFirstValue.Empty())
 				oSecondValue.Clear();
@@ -61,39 +57,18 @@ namespace NSCSS
 			}
 		}
 
-		static bool LevelIsSame(const CValueBase& oFirstValue, const CValueBase& oSecondValue)
+		static bool LevelIsSame(const CValue& oFirstValue, const CValue& oSecondValue)
 		{
 			return oFirstValue.m_unLevel == oSecondValue.m_unLevel;
 		}
 
-		friend bool operator==(const CValueBase& oLeftValue, const CValueBase& oRightValue)
-		{
-			if (oLeftValue.Empty() && oRightValue.Empty())
-				return true;
+		bool operator==(const T& oValue) const { return m_oValue == oValue; }
+		bool operator>=(const T& oValue) const { return m_oValue >= oValue; }
+		bool operator<=(const T& oValue) const { return m_oValue <= oValue; }
+		bool operator> (const T& oValue) const { return m_oValue > oValue; }
+		bool operator< (const T& oValue) const { return m_oValue < oValue; }
 
-			if (( oLeftValue.Empty() && !oRightValue.Empty()) ||
-			    (!oLeftValue.Empty() &&  oRightValue.Empty()))
-				return false;
-
-			return oLeftValue.m_oValue == oRightValue.m_oValue;
-		}
-
-		friend bool operator!=(const CValueBase& oLeftValue, const CValueBase& oRightValue)
-		{
-			return !(oLeftValue == oRightValue);
-		}
-
-		bool operator==(const T& oValue) const
-		{
-			return m_oValue == oValue;
-		}
-
-		bool operator!=(const T& oValue) const
-		{
-			return m_oValue != oValue;
-		}
-
-		virtual CValueBase& operator =(const CValueBase& oValue)
+		virtual CValue& operator =(const CValue& oValue)
 		{
 			m_oValue     = oValue.m_oValue;
 			m_unLevel    = oValue.m_unLevel;
@@ -102,93 +77,70 @@ namespace NSCSS
 			return *this;
 		}
 
-		virtual CValueBase& operator =(const T& oValue)
+		virtual CValue& operator =(const T& oValue)
 		{
-			m_oValue = oValue;
-
+			//m_oValue = oValue.m_oValue;
 			return *this;
 		}
 
-		virtual CValueBase& operator+=(const CValueBase& oValue)
+		virtual CValue& operator+=(const CValue& oValue)
 		{
 			if (m_unLevel > oValue.m_unLevel || (m_bImportant && !oValue.m_bImportant) || oValue.Empty())
 				return *this;
 
-			*this = oValue;
+			m_oValue     = oValue.m_oValue;
+			m_unLevel    = oValue.m_unLevel;
+			m_bImportant = oValue.m_bImportant;
 
 			return *this;
 		}
-	};
 
-	template<typename T>
-	class CValueOptional : public CValueBase<boost::optional<T>>
-	{
-	protected:
-		CValueOptional() = default;
-
-		CValueOptional(const T& oValue, unsigned int unLevel = 0, bool bImportant = false)
-		    : CValueBase<boost::optional<T>>(oValue, unLevel, bImportant)
-		{}
-	public:
-		virtual bool Empty() const override
+		virtual bool operator==(const CValue& oValue) const
 		{
-			return !this->m_oValue.has_value();
-		}
-		void Clear() override
-		{
-			this->m_oValue.reset();
-			this->m_unLevel = 0;
-			this->m_bImportant = false;
+			return m_oValue == oValue.m_oValue;
 		}
 
-		bool operator==(const T& oValue) const
+		virtual bool operator!=(const CValue& oValue) const
 		{
-			if (!this->m_oValue.has_value())
-				return false;
-
-			return this->m_oValue.value() == oValue;
-		}
-
-		virtual CValueOptional& operator=(const T& oValue)
-		{
-			this->m_oValue = oValue;
-
-			return *this;
+			return m_oValue != oValue.m_oValue;
 		}
 	};
 
-	class CString : public CValueOptional<std::wstring>
+	class CString : public CValue<std::wstring>
 	{
 	public:
-		CString() = default;
-		CString(const std::wstring& wsValue, unsigned int unLevel = 0, bool bImportant = false);
+		CString();
+		CString(const std::wstring& wsValue, unsigned int unLevel, bool bImportant = false);
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) override;
 		bool SetValue(const std::wstring& wsValue, const std::vector<std::wstring>& arValiableValues, unsigned int unLevel, bool bHardMode);
 		bool SetValue(const std::wstring& wsValue, const std::map<std::wstring, std::wstring>& arValiableValues, unsigned int unLevel, bool bHardMode);
 
 		bool Empty() const override;
+		void Clear() override;
 
 		int          ToInt()     const override;
 		double       ToDouble()  const override;
 		std::wstring ToWString() const override;
 
-		bool operator==(const wchar_t* pValue) const;
-		bool operator!=(const wchar_t* pValue) const;
-
-		using CValueOptional<std::wstring>::operator=;
+		CString& operator+=(const CString& oString);
 	};
 
-	class CDigit : public CValueOptional<double>
+	class CDigit : public CValue<double>
 	{
+		UnitMeasure m_enUnitMeasure;
+
+		double ConvertValue(double dPrevValue, UnitMeasure enUnitMeasure) const;
 	public:
 		CDigit();
-		CDigit(const double& dValue, unsigned int unLevel = 0, bool bImportant = false);
+		CDigit(double dValue);
+		CDigit(double dValue, unsigned int unLevel, bool bImportant = false);
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
 		bool SetValue(const CDigit& oValue);
 		bool SetValue(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel = 0, bool bHardMode = true);
 
+		bool Empty() const override;
 		bool Zero() const;
 		void Clear() override;
 
@@ -204,7 +156,7 @@ namespace NSCSS
 
 		UnitMeasure GetUnitMeasure() const;
 
-		bool operator==(const double& dValue) const;
+		bool operator==(const double& oValue) const;
 		bool operator==(const CDigit& oDigit) const;
 
 		bool operator!=(const double& oValue) const;
@@ -219,19 +171,11 @@ namespace NSCSS
 
 		CDigit& operator+=(const CDigit& oDigit);
 		CDigit& operator-=(const CDigit& oDigit);
-		CDigit& operator+=(const double& dValue);
-		CDigit& operator-=(const double& dValue);
-		CDigit& operator*=(const double& dValue);
-		CDigit& operator/=(const double& dValue);
-
-		using CValueOptional<double>::operator=;
-	private:
-		UnitMeasure m_enUnitMeasure;
-
-		double ConvertValue(double dPrevValue, UnitMeasure enUnitMeasure) const;
-
-		template <typename Operation>
-		CDigit ApplyOperation(const CDigit& oDigit, Operation operation) const;
+		CDigit& operator+=(double dValue);
+		CDigit& operator-=(double dValue);
+		CDigit& operator*=(double dValue);
+		CDigit& operator/=(double dValue);
+		CDigit& operator =(double dValue);
 	};
 
 	struct TRGB
@@ -242,8 +186,6 @@ namespace NSCSS
 
 		bool Empty() const;
 
-		int ToInt() const;
-
 		bool operator==(const TRGB& oRGB) const;
 		bool operator!=(const TRGB& oRGB) const;
 	};
@@ -269,58 +211,31 @@ namespace NSCSS
 	
 	typedef enum
 	{
+		ColorEmpty,
 		ColorNone,
 		ColorRGB,
 		ColorHEX,
 		ColorUrl,
 		ColorContextStroke,
 		ColorContextFill
-	} EColorType;
+	} ColorType;
 
-	class CColorValue
-	{
-		using color_value = boost::variant2::variant<boost::blank, std::wstring, TRGB, CURL>;
-	protected:
-		EColorType  m_eType;
-	public:
-		CColorValue();
-		CColorValue(const CColorValue& oValue);
-		CColorValue(const std::wstring& wsValue);
-		CColorValue(const TRGB& oValue);
-		CColorValue(const CURL& oValue);
-
-		EColorType GetType() const;
-
-		bool operator==(const CColorValue& oValue) const;
-
-		color_value m_oValue;
-	};
-
-	class CColorValueContextStroke : public CColorValue
-	{
-	public:
-		CColorValueContextStroke();
-	};
-
-	class CColorValueContextFill : public CColorValue
-	{
-	public:
-		CColorValueContextFill();
-	};
-
-	class CColor : public CValueOptional<CColorValue>
+	class CColor : public CValue<void*>
 	{
 	public:
 		CColor();
+		CColor(const CColor& oColor);
+		~CColor();
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
 		bool SetOpacity(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true);
 
+		bool Empty() const override;
 		bool None() const;
 		bool Url() const;
 		void Clear() override;
 
-		EColorType GetType() const;
+		ColorType GetType() const;
 
 		double GetOpacity() const;
 
@@ -334,15 +249,20 @@ namespace NSCSS
 		static TRGB ConvertHEXtoRGB(const std::wstring& wsValue);
 		static std::wstring ConvertRGBtoHEX(const TRGB& oValue);
 
-		using CValueOptional<CColorValue>::operator=;
+		bool operator==(const CColor& oColor) const;
+		bool operator!=(const CColor& oColor) const;
+
+		CColor& operator =(const CColor& oColor);
+		CColor& operator+=(const CColor& oColor);
 	private:
-		CDigit m_oOpacity;
+		CDigit    m_oOpacity;
+		ColorType m_enType;
 
 		void SetEmpty(unsigned int unLevel = 0);
 		void SetRGB(unsigned char uchR, unsigned char uchG, unsigned char uchB);
 		void SetRGB(const TRGB& oRGB);
 		void SetHEX(const std::wstring& wsValue);
-		bool SetUrl(const std::wstring& wsValue);
+		void SetUrl(const std::wstring& wsValue);
 		void SetNone();
 	};
 
@@ -359,7 +279,7 @@ namespace NSCSS
 
 	typedef std::vector<std::pair<std::vector<double>, TransformType>> MatrixValues;
 
-	class CMatrix : public CValueBase<MatrixValues>
+	class CMatrix : public CValue<MatrixValues>
 	{
 		std::vector<std::wstring> CutTransforms(const std::wstring& wsValue) const;
 	public:
@@ -384,27 +304,29 @@ namespace NSCSS
 		bool operator==(const CMatrix& oMatrix) const;
 		CMatrix& operator+=(const CMatrix& oMatrix);
 		CMatrix& operator-=(const CMatrix& oMatrix);
-
-		using CValueBase<MatrixValues>::operator=;
 	};
 
-	class CEnum : public CValueOptional<int>
+	class CEnum : public CValue<int>
 	{
+		std::map<std::wstring, int> m_mMap;
 	public:
 		CEnum();
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) override;
 		void SetMapping(const std::map<std::wstring, int>& mMap, int nDefaulvalue = -1);
 
-		int ToInt() const override;
+		bool Empty() const override;
+		void Clear() override;
 
-		using CValueOptional<int>::operator=;
+		CEnum &operator =(int nValue);
+
+		bool operator==(int nValue) const;
+		bool operator!=(int nValue) const;
+
+		int ToInt() const override;
 	private:
 		double ToDouble() const override;
 		std::wstring ToWString() const override;
-
-		int m_nDefaultValue;
-		std::map<std::wstring, int> m_mMap;
 	};
 
 	// PROPERTIES
@@ -697,30 +619,6 @@ namespace NSCSS
 		bool operator==(const TTextDecoration& oTextDecoration) const;
 	};
 
-	typedef enum
-	{
-		Baseline,
-		Sub,
-		Super,
-		Percentage,
-		Length
-	} EBaselineShift;
-
-	class CBaselineShift
-	{
-		CEnum   m_eType;
-		CDigit  m_oValue;
-	public:
-		CBaselineShift();
-
-		bool Empty() const;
-
-		EBaselineShift GetType() const;
-		double         GetValue() const;
-
-		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-	};
-
 	class CText
 	{
 	public:
@@ -728,12 +626,11 @@ namespace NSCSS
 
 		static void Equation(CText &oFirstText, CText &oSecondText);
 
-		bool SetIndent        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetAlign         (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetDecoration    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetColor         (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetHighlight     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetBaselineShift (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetIndent    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetAlign     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetDecoration(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetColor     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetHighlight (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		const CDigit&          GetIndent()     const;
 		const CString&         GetAlign()      const;
@@ -741,9 +638,6 @@ namespace NSCSS
 		const CColor&          GetColor()      const;
 		const CColor&          GetHighlight()  const;
 
-		EBaselineShift GetBaselineShiftType()  const;
-		double         GetBaselineShiftValue() const;
-
 		bool Empty() const;
 
 		bool Underline()   const;
@@ -753,7 +647,6 @@ namespace NSCSS
 		CText& operator+=(const CText& oText);
 		bool   operator==(const CText& oText) const;
 	private:
-		CBaselineShift  m_oBaselineShift;
 		TTextDecoration m_oDecoration;
 		CDigit          m_oIndent;
 		CString         m_oAlign;

Common/3dParty/md/md2html.cpp

@@ -5,7 +5,7 @@
 
 namespace Md
 {
-#define MD_PARSER_FLAGS MD_DIALECT_GITHUB | MD_FLAG_NOINDENTEDCODEBLOCKS | MD_HTML_FLAG_SKIP_UTF8_BOM | MD_FLAG_HARD_SOFT_BREAKS | MD_HTML_FLAG_XHTML | MD_FLAG_LATEXMATHSPANS
+#define MD_PARSER_FLAGS MD_DIALECT_GITHUB | MD_FLAG_NOINDENTEDCODEBLOCKS | MD_HTML_FLAG_SKIP_UTF8_BOM | MD_FLAG_HARD_SOFT_BREAKS | MD_HTML_FLAG_XHTML
 #define MD_RENDERER_FLAGS MD_HTML_FLAG_XHTML
 
 void ToHtml(const MD_CHAR* pValue, MD_SIZE uSize, void* pData)

Common/3dParty/openssl/common/common_openssl.cpp

@@ -133,7 +133,7 @@ namespace NSOpenSSL
 	}
 
 	// rsa
-	bool RSA_GenerateKeys(unsigned char*& publicKey, unsigned char*& privateKey)
+	bool RSA_GenerateKeys(unsigned char*& publicKey, unsigned char*& privateKey, const int keyLen)
 	{
 		publicKey = NULL;
 		privateKey = NULL;
@@ -142,7 +142,8 @@ namespace NSOpenSSL
 		BIGNUM *exponent = BN_new();
 
 		BN_set_word(exponent, RSA_F4);
-		int result = RSA_generate_multi_prime_key(rsa, 2048, 2, exponent, NULL);
+		int primes = (keyLen < 4096) ? 2 : 4;
+		int result = RSA_generate_multi_prime_key(rsa, keyLen, primes, exponent, NULL);
 		if (0 == result)
 			return false;
 
@@ -370,6 +371,27 @@ namespace NSOpenSSL
 	// new algs
 	bool GenerateKeysByAlgs(const std::string& alg, std::string& publicKey, std::string& privateKey)
 	{
+		int nRsaKeyLen = 0;
+		if ("rsa2048" == alg)
+			nRsaKeyLen = 2048;
+		else if ("rsa4096" == alg)
+			nRsaKeyLen = 4096;
+
+		if (nRsaKeyLen > 0)
+		{
+			unsigned char* publicKeyPtr = NULL;
+			unsigned char* privateKeyPtr = NULL;
+			if (!RSA_GenerateKeys(publicKeyPtr, privateKeyPtr))
+				return false;
+
+			publicKey = std::string((char*)publicKeyPtr);
+			privateKey = std::string((char*)privateKeyPtr);
+
+			openssl_free(publicKeyPtr);
+			openssl_free(privateKeyPtr);
+			return true;
+		}
+
 		EVP_PKEY* pkey = NULL;
 		EVP_PKEY_CTX* pctx = NULL;
 
@@ -453,7 +475,7 @@ namespace NSOpenSSL
 		return (1 == nResult) ? true : false;
 	}
 
-	CMemoryData Enrypt(const unsigned char* data, const int& data_len, const std::string& publicKey)
+	CMemoryData Encrypt(const unsigned char* data, const int& data_len, const std::string& publicKey, const bool& isLenToBuffer)
 	{
 		CMemoryData returnData;
 
@@ -477,8 +499,19 @@ namespace NSOpenSSL
 
 		size_t ciphertextLen = 0;
 		EVP_PKEY_encrypt(ctx, NULL, &ciphertextLen, data, (size_t)data_len);
-		returnData.Alloc(ciphertextLen);
-		EVP_PKEY_encrypt(ctx, returnData.Data, &returnData.Size, data, (size_t)data_len);
+
+		if (isLenToBuffer)
+		{
+			returnData.Alloc(ciphertextLen + 4);
+			EVP_PKEY_encrypt(ctx, returnData.Data + 4, &returnData.Size, data, (size_t)data_len);
+			int nLen = (int)returnData.Size;
+			memcpy(returnData.Data, &nLen, 4);
+		}
+		else
+		{
+			returnData.Alloc(ciphertextLen);
+			EVP_PKEY_encrypt(ctx, returnData.Data, &returnData.Size, data, (size_t)data_len);
+		}
 
 		EVP_PKEY_free(pkey);
 		EVP_PKEY_CTX_free(ctx);
@@ -486,7 +519,7 @@ namespace NSOpenSSL
 		return returnData;
 	}
 
-	CMemoryData Decrypt(const unsigned char* data, const int& data_len, const std::string& privateKey)
+	CMemoryData Decrypt(const unsigned char* data, const int& data_len, const std::string& privateKey, const bool& isLenToBuffer)
 	{
 		CMemoryData returnData;
 
@@ -510,8 +543,19 @@ namespace NSOpenSSL
 
 		size_t ciphertextLen = 0;
 		EVP_PKEY_decrypt(ctx, NULL, &ciphertextLen, data, (size_t)data_len);
-		returnData.Alloc(ciphertextLen);
-		EVP_PKEY_decrypt(ctx, returnData.Data, &returnData.Size, data, (size_t)data_len);
+
+		if (isLenToBuffer)
+		{
+			returnData.Alloc(ciphertextLen + 4);
+			EVP_PKEY_decrypt(ctx, returnData.Data + 4, &returnData.Size, data, (size_t)data_len);
+			int nLen = (int)returnData.Size;
+			memcpy(returnData.Data, &nLen, 4);
+		}
+		else
+		{
+			returnData.Alloc(ciphertextLen);
+			EVP_PKEY_decrypt(ctx, returnData.Data, &returnData.Size, data, (size_t)data_len);
+		}
 
 		EVP_PKEY_free(pkey);
 		EVP_PKEY_CTX_free(ctx);

Common/3dParty/openssl/common/common_openssl.h

@@ -75,7 +75,7 @@ namespace NSOpenSSL
 	OPENSSL_DECL unsigned char* GetHash(const unsigned char* data, const unsigned int& size, const int& alg, unsigned int& len);
 
 	// rsa
-	OPENSSL_DECL bool RSA_GenerateKeys(unsigned char*& publicKey, unsigned char*& privateKey);
+	OPENSSL_DECL bool RSA_GenerateKeys(unsigned char*& publicKey, unsigned char*& privateKey, const int keyLen = 2048);
 	OPENSSL_DECL bool RSA_EncryptPublic(const unsigned char* publicKey, const unsigned char* data, const unsigned int& size, unsigned char*& data_crypt, unsigned int& data_crypt_len);
 	OPENSSL_DECL bool RSA_DecryptPrivate(const unsigned char* privateKey, const unsigned char* data, const unsigned int& size, unsigned char*& data_decrypt, unsigned int& data_decrypt_len);
 
@@ -91,8 +91,8 @@ namespace NSOpenSSL
 	OPENSSL_DECL CMemoryData Sign(const unsigned char* data, const int& len, const std::string& privateKey);
 	OPENSSL_DECL bool Verify(const unsigned char* data, const int& data_len, const std::string& publicKey,
 							 const unsigned char* signature, const int& signature_len);
-	OPENSSL_DECL CMemoryData Enrypt(const unsigned char* data, const int& data_len, const std::string& publicKey);
-	OPENSSL_DECL CMemoryData Decrypt(const unsigned char* data, const int& data_len, const std::string& privateKey);
+	OPENSSL_DECL CMemoryData Encrypt(const unsigned char* data, const int& data_len, const std::string& publicKey, const bool& isLenToBuffer = false);
+	OPENSSL_DECL CMemoryData Decrypt(const unsigned char* data, const int& data_len, const std::string& privateKey, const bool& isLenToBuffer = false);
 
 	// aes
 	OPENSSL_DECL int AES_GetKeySize(int type);

Common/3dParty/pole/pole.h

@@ -90,7 +90,7 @@ static std::wstring convertUtf16ToWString(const UTF16 * Data, int nLength)
         return std::wstring();
     }
 
-    std::wstring wstr ((wchar_t *) pStrUtf32, nLength);
+    std::wstring wstr ((wchar_t *) pStrUtf32);
 
     delete [] pStrUtf32;
     return wstr;

Common/OfficeFileFormatChecker2.cpp

@@ -967,7 +967,7 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT;
 	else if (0 == sExt.compare(L".md"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_MD;
-	else if (0 == sExt.compare(L".csv") || 0 == sExt.compare(L".tsv") || 0 == sExt.compare(L".xls") || 0 == sExt.compare(L".xlsx") || 0 == sExt.compare(L".xlsb"))
+	else if (0 == sExt.compare(L".csv") || 0 == sExt.compare(L".xls") || 0 == sExt.compare(L".xlsx") || 0 == sExt.compare(L".xlsb"))
 		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV;
 	else if (0 == sExt.compare(L".html") || 0 == sExt.compare(L".htm"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML;

Common/js/make.py

@@ -10,6 +10,8 @@ import common
 
 base.configure_common_apps()
 
+python_binary = sys.executable
+
 # fetch emsdk
 command_prefix = "" if ("windows" == base.host_platform()) else "./"
 if not base.is_dir("emsdk"):
@@ -141,9 +143,9 @@ for param in argv:
   if json_data["run_before"]:
     base.print_info("before")
     if base.is_file(work_dir + json_data["run_before"]):
-      base.cmd_in_dir(work_dir, "python", [json_data["run_before"]])
+      base.cmd_in_dir(work_dir, python_binary, [json_data["run_before"]])
     else:
-      base.cmd_in_dir(work_dir, "python", ["-c", json_data["run_before"]])
+      base.cmd_in_dir(work_dir, python_binary, ["-c", json_data["run_before"]])
 
   # remove previous version
   common.clear_dir(work_dir + "/o")
@@ -169,6 +171,6 @@ for param in argv:
   if json_data["run_after"]:
     base.print_info("after")
     if base.is_file(work_dir + json_data["run_after"]):
-      base.cmd_in_dir(work_dir, "python", [json_data["run_after"]])
+      base.cmd_in_dir(work_dir, python_binary, [json_data["run_after"]])
     else:
-      base.cmd_in_dir(work_dir, "python", ["-c", json_data["run_after"]])
+      base.cmd_in_dir(work_dir, python_binary, ["-c", json_data["run_after"]])

DesktopEditor/common/SystemUtils.h

@@ -60,7 +60,6 @@ namespace NSSystemUtils
 	static const wchar_t* gc_EnvModified = L"MODIFIED";
 	static const wchar_t* gc_EnvMemoryLimit = L"X2T_MEMORY_LIMIT";
 	static const wchar_t* gc_EnvMemoryLimitDefault = L"4GiB";
-	static const wchar_t* gc_EnvSigningKeystorePassphrase = L"SIGNING_KEYSTORE_PASSPHRASE";
 
 	KERNEL_DECL std::string GetEnvVariableA(const std::wstring& strName);
 	KERNEL_DECL std::wstring GetEnvVariable(const std::wstring& strName);

DesktopEditor/doctrenderer/drawingfile.h

@@ -490,9 +490,6 @@ public:
 				return NULL;
 		}
 
-		if (m_nType == 0)
-			((CPdfFile*)m_pFile)->SetPageFonts(nPageIndex);
-
 		BYTE* res = oRes.GetBuffer();
 		oRes.ClearWithoutAttack();
 		return res;
@@ -581,13 +578,6 @@ public:
 		}
 		return NULL;
 	}
-	BYTE* GetGIDByUnicode(const std::string& sPathA)
-	{
-		if (m_nType != 0)
-			return NULL;
-		std::wstring sFontName = UTF8_TO_U(sPathA);
-		return ((CPdfFile*)m_pFile)->GetGIDByUnicode(sFontName);
-	}
 
 	std::wstring GetFontBinaryNative(const std::wstring& sName)
 	{

DesktopEditor/fontengine/FontFile.cpp

@@ -731,10 +731,10 @@ void CFontFile::CheckHintsSupport()
 int CFontFile::SetCMapForCharCode(long lUnicode, int *pnCMapIndex)
 {
 	*pnCMapIndex = -1;
-	if (!m_pFace || !m_pFace->num_charmaps)
+	if (!m_pFace)
 		return 0;
 
-	if ( m_bStringGID )
+	if ( m_bStringGID || 0 == m_pFace->num_charmaps )
 		return lUnicode;
 
 	int nCharIndex = 0;

DesktopEditor/fontengine/js/cpp/text.cpp

@@ -117,7 +117,7 @@ WASM_EXPORT unsigned int ASC_FT_SetCMapForCharCode(FT_Face face, unsigned int un
 		return 0;
 
 	if ( 0 == face->num_charmaps )
-		return 0;
+		return unicode;
 
 	unsigned int nCharIndex = 0;
 

DesktopEditor/fontengine/js/libfont.json

@@ -265,15 +265,15 @@
 	},
 	{
 		"folder": "../../",
-		"files": ["graphics/Image.cpp", "raster/BgraFrame.cpp", "raster/ImageFileFormatChecker.cpp", "graphics/Matrix.cpp", "graphics/GraphicsPath.cpp"]
+		"files": ["graphics/Image.cpp", "raster/BgraFrame.cpp", "raster/ImageFileFormatChecker.cpp", "graphics/Matrix.cpp"]
 	},
 	{
 		"folder": "../../agg-2.4/src/",
-		"files": ["agg_trans_affine.cpp", "agg_bezier_arc.cpp"]
+		"files": ["agg_trans_affine.cpp"]
 	},
 	{
 		"folder": "../../raster/",
-		"files": ["PICT/PICFile.cpp"]
+		"files": ["PICT/PICFile.cpp", "PICT/pic.cpp"]
 	},
 	{
 		"folder": "../../graphics/pro/js/qt/raster",

DesktopEditor/graphics/BooleanOperations.cpp

@@ -737,13 +737,11 @@ CBooleanOperations::CBooleanOperations(const CGraphicsPath& path1,
 									   const CGraphicsPath& path2,
 									   BooleanOpType op,
 									   long fillType,
-									   bool isLuminosity,
-									   bool isSelf) :
+									   bool isLuminosity) :
 	Op(op),
 	Close1(path1.Is_poly_closed()),
 	Close2(path2.Is_poly_closed()),
 	IsLuminosity(isLuminosity),
-	IsSelf(isSelf),
 	FillType(fillType),
 	Path1(path1),
 	Path2(path2)
@@ -786,9 +784,10 @@ bool CBooleanOperations::IsSelfInters(const CGraphicsPath& p)
 void CBooleanOperations::TraceBoolean()
 {
 	bool reverse = false;
+	bool self = Path1 == Path2;
 	if (((Op == Subtraction || Op == Exclusion) ^
 		 Path1.IsClockwise() ^
-		 Path2.IsClockwise()) && !IsSelf)
+		 Path2.IsClockwise()) && !self)
 		reverse = true;
 
 	PreparePath(Path1, 1, Segments1, Curves1);
@@ -799,7 +798,7 @@ void CBooleanOperations::TraceBoolean()
 
 	GetIntersection();
 
-	if (IsSelf)
+	if (self)
 	{
 		if (Op == Subtraction)
 			return;
@@ -824,11 +823,6 @@ void CBooleanOperations::TraceBoolean()
 		CreateNewPath(adj_matr);
 		return;
 	}
-	else if (Path1 == Path2)
-	{
-		Result = std::move(Path1);
-		return;
-	}
 
 	if (!Locations.empty())
 	{
@@ -2361,7 +2355,7 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 		CBooleanOperations o;
 		if (i > skip_end2 && o.IsSelfInters(paths2[i]))
 		{
-			CBooleanOperations operation(paths2[i], paths2[i], Intersection, fillType, isLuminosity, true);
+			CBooleanOperations operation(paths2[i], paths2[i], Intersection, fillType, isLuminosity);
 			CGraphicsPath p = std::move(operation.GetResult());
 
 			std::vector<CGraphicsPath> tmp_paths = p.GetSubPaths();
@@ -2376,7 +2370,7 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 			CBooleanOperations o2;
 			if (j > skip_end1 && o2.IsSelfInters(paths1[j]))
 			{
-				CBooleanOperations operation(paths1[j], paths1[j], Intersection, fillType, isLuminosity, true);
+				CBooleanOperations operation(paths1[j], paths1[j], Intersection, fillType, isLuminosity);
 				CGraphicsPath p = std::move(operation.GetResult());
 
 				std::vector<CGraphicsPath> tmp_paths = p.GetSubPaths();
@@ -2386,7 +2380,7 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 					paths1.insert(paths1.begin() + i + k, tmp_paths[k]);
 			}
 
-			CBooleanOperations operation(paths1[j], paths2[i], op, fillType, isLuminosity, false);
+			CBooleanOperations operation(paths1[j], paths2[i], op, fillType, isLuminosity);
 			paths.push_back(operation.GetResult());
 		}
 

DesktopEditor/graphics/BooleanOperations.h

@@ -108,7 +108,7 @@ namespace Aggplus
 	{
 	public:
 		CBooleanOperations() {};
-		CBooleanOperations(const CGraphicsPath& path1, const CGraphicsPath& path2, BooleanOpType op, long fillType, bool isLuminosity, bool isSelf);
+		CBooleanOperations(const CGraphicsPath& path1, const CGraphicsPath& path2, BooleanOpType op, long fillType, bool isLuminosity);
 		~CBooleanOperations();
 		CGraphicsPath&& GetResult();
 		bool IsSelfInters(const CGraphicsPath& p);
@@ -166,7 +166,6 @@ namespace Aggplus
 		bool Close1 = true;
 		bool Close2 = true;
 		bool IsLuminosity = false;
-		bool IsSelf = false;
 
 		// c_nStroke, c_nWindingFillMode, c_nEvenOddFillMode
 		long FillType = c_nWindingFillMode;

DesktopEditor/graphics/Graphics.cpp

@@ -2142,12 +2142,7 @@ namespace Aggplus
 			agg::trans_affine* full_trans = &m_oFullTransform.m_internal->m_agg_mtx;
 			double dDet = full_trans->determinant();
 
-			double sx = sqrt(full_trans->sx * full_trans->sx + full_trans->shx * full_trans->shx);
-			double sy = sqrt(full_trans->shy * full_trans->shy + full_trans->sy * full_trans->sy);
-			double scale = std::max(sx, sy);
-			double adaptive_threshold = 1.0 / (scale * scale * 10000.0);
-
-			if (fabs(dDet) < std::max(0.0001, adaptive_threshold))
+			if (fabs(dDet) < 0.0001)
 			{
 				path_copy.transform_all_paths(m_oFullTransform.m_internal->m_agg_mtx);
 				dWidth *= sqrt(fabs(dDet));
@@ -2245,8 +2240,6 @@ namespace Aggplus
 				LONG lCount2	= lCount / 2;
 
 				double dKoef = 1.0;
-				if (bIsUseIdentity)
-					dKoef = sqrt(fabs(m_oFullTransform.m_internal->m_agg_mtx.determinant()));
 
 				for (LONG i = 0; i < lCount2; ++i)
 				{

DesktopEditor/graphics/IRenderer.h

@@ -117,7 +117,6 @@ const long c_nDarkMode          = 0x0008;
 const long c_nUseDictionaryFonts = 0x0010;
 const long c_nPenWidth0As1px	= 0x0020;
 const long c_nSupportPathTextAsText = 0x0040;
-const long c_nFontSubstitution  = 0x0080;
 
 // типы рендерера
 const long c_nUnknownRenderer   = 0x0000;

DesktopEditor/graphics/commands/AnnotField.cpp

@@ -46,92 +46,6 @@
 // void Set(const std::wstring& ws) { m_ws = ws; }
 // const std::wstring& Get() { return m_ws; }
 
-CAnnotFieldInfo::CActionFieldPr* ReadAction(NSOnlineOfficeBinToPdf::CBufferReader* pReader)
-{
-	CAnnotFieldInfo::CActionFieldPr* pRes = new CAnnotFieldInfo::CActionFieldPr();
-
-	pRes->nActionType = pReader->ReadByte();
-	switch (pRes->nActionType)
-	{
-	case 14: // JavaScript
-	{
-		pRes->wsStr1 = pReader->ReadString();
-		break;
-	}
-	case 1: // GoTo
-	{
-		pRes->nInt1 = pReader->ReadInt();
-		pRes->nKind = pReader->ReadByte();
-		switch (pRes->nKind)
-		{
-		case 0:
-		case 2:
-		case 3:
-		case 6:
-		case 7:
-		{
-			pRes->nFlags = pReader->ReadByte();
-			if (pRes->nFlags & (1 << 0))
-				pRes->dD[0] = pReader->ReadDouble();
-			if (pRes->nFlags & (1 << 1))
-				pRes->dD[1] = pReader->ReadDouble();
-			if (pRes->nFlags & (1 << 2))
-				pRes->dD[2] = pReader->ReadDouble();
-			break;
-		}
-		case 4:
-		{
-			pRes->dD[0] = pReader->ReadDouble();
-			pRes->dD[1] = pReader->ReadDouble();
-			pRes->dD[2] = pReader->ReadDouble();
-			pRes->dD[3] = pReader->ReadDouble();
-			break;
-		}
-		case 1:
-		case 5:
-		default:
-		{
-			break;
-		}
-		}
-		break;
-	}
-	case 10: // Named
-	{
-		pRes->wsStr1 = pReader->ReadString();
-		break;
-	}
-	case 6: // URI
-	{
-		pRes->wsStr1 = pReader->ReadString();
-		break;
-	}
-	case 9: // Hide
-	{
-		pRes->nKind = pReader->ReadByte();
-		int n = pReader->ReadInt();
-		pRes->arrStr.reserve(n);
-		for (int i = 0; i < n; ++i)
-			pRes->arrStr.push_back(pReader->ReadString());
-		break;
-	}
-	case 12: // ResetForm
-	{
-		pRes->nInt1 = pReader->ReadInt();
-		int n = pReader->ReadInt();
-		pRes->arrStr.reserve(n);
-		for (int i = 0; i < n; ++i)
-			pRes->arrStr.push_back(pReader->ReadString());
-		break;
-	}
-	}
-
-	if (pReader->ReadByte())
-		pRes->pNext = ReadAction(pReader);
-
-	return pRes;
-}
-
 CAnnotFieldInfo::CAnnotFieldInfo() : IAdvancedCommand(AdvancedCommandType::Annotaion)
 {
 	m_nType = EAnnotType::Unknown;
@@ -163,7 +77,6 @@ CAnnotFieldInfo::CAnnotFieldInfo() : IAdvancedCommand(AdvancedCommandType::Annot
 	m_pCaretPr        = NULL;
 	m_pStampPr        = NULL;
 	m_pRedactPr       = NULL;
-	m_pLinkPr         = NULL;
 	m_pWidgetPr       = NULL;
 }
 CAnnotFieldInfo::~CAnnotFieldInfo()
@@ -180,7 +93,6 @@ CAnnotFieldInfo::~CAnnotFieldInfo()
 	RELEASEOBJECT(m_pCaretPr);
 	RELEASEOBJECT(m_pStampPr);
 	RELEASEOBJECT(m_pRedactPr);
-	RELEASEOBJECT(m_pLinkPr);
 	RELEASEOBJECT(m_pWidgetPr);
 }
 
@@ -201,12 +113,6 @@ void CAnnotFieldInfo::SetType(int nType)
 		m_pTextPr = new CAnnotFieldInfo::CTextAnnotPr();
 		break;
 	}
-	case EAnnotType::Link:
-	{
-		RELEASEOBJECT(m_pLinkPr);
-		m_pLinkPr = new CAnnotFieldInfo::CLinkAnnotPr();
-		break;
-	}
 	case EAnnotType::FreeText:
 	{
 		CreateMarkup();
@@ -399,10 +305,6 @@ bool CAnnotFieldInfo::IsRedact() const
 {
 	return (m_nType == 25);
 }
-bool CAnnotFieldInfo::IsLink() const
-{
-	return (m_nType == 1);
-}
 
 CAnnotFieldInfo::CMarkupAnnotPr*       CAnnotFieldInfo::GetMarkupAnnotPr()       { return m_pMarkupPr; }
 CAnnotFieldInfo::CTextAnnotPr*         CAnnotFieldInfo::GetTextAnnotPr()         { return m_pTextPr; }
@@ -416,7 +318,6 @@ CAnnotFieldInfo::CFreeTextAnnotPr*     CAnnotFieldInfo::GetFreeTextAnnotPr()
 CAnnotFieldInfo::CCaretAnnotPr*        CAnnotFieldInfo::GetCaretAnnotPr()        { return m_pCaretPr; }
 CAnnotFieldInfo::CStampAnnotPr*        CAnnotFieldInfo::GetStampAnnotPr()        { return m_pStampPr; }
 CAnnotFieldInfo::CRedactAnnotPr*       CAnnotFieldInfo::GetRedactAnnotPr()       { return m_pRedactPr; }
-CAnnotFieldInfo::CLinkAnnotPr*         CAnnotFieldInfo::GetLinkAnnotPr()         { return m_pLinkPr; }
 CAnnotFieldInfo::CWidgetAnnotPr*       CAnnotFieldInfo::GetWidgetAnnotPr()       { return m_pWidgetPr; }
 
 bool CAnnotFieldInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector)
@@ -511,8 +412,6 @@ bool CAnnotFieldInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMeta
 		m_pPopupPr->Read(pReader);
 	else if (IsWidget())
 		m_pWidgetPr->Read(pReader, nType);
-	else if (IsLink())
-		m_pLinkPr->Read(pReader);
 
 	return m_nType != -1;
 }
@@ -822,45 +721,6 @@ void CAnnotFieldInfo::CRedactAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader
 	}
 }
 
-CAnnotFieldInfo::CLinkAnnotPr::CLinkAnnotPr()
-{
-	m_pAction = NULL;
-	m_pPA = NULL;
-}
-CAnnotFieldInfo::CLinkAnnotPr::~CLinkAnnotPr()
-{
-	RELEASEOBJECT(m_pAction);
-	RELEASEOBJECT(m_pPA);
-}
-BYTE CAnnotFieldInfo::CLinkAnnotPr::GetH() const { return m_nH; }
-int CAnnotFieldInfo::CLinkAnnotPr::GetFlags() const { return m_nFlags; }
-const std::vector<double>& CAnnotFieldInfo::CLinkAnnotPr::GetQuadPoints() { return m_arrQuadPoints; }
-CAnnotFieldInfo::CActionFieldPr* CAnnotFieldInfo::CLinkAnnotPr::GetA() { return m_pAction; }
-CAnnotFieldInfo::CActionFieldPr* CAnnotFieldInfo::CLinkAnnotPr::GetPA() { return m_pPA; }
-void CAnnotFieldInfo::CLinkAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader)
-{
-	m_nFlags = pReader->ReadInt();
-	if (m_nFlags & (1 << 0))
-	{
-		pReader->ReadString();
-		m_pAction = ReadAction(pReader);
-	}
-	if (m_nFlags & (1 << 1))
-	{
-		pReader->ReadString();
-		m_pPA = ReadAction(pReader);
-	}
-	if (m_nFlags & (1 << 2))
-		m_nH = pReader->ReadByte();
-	if (m_nFlags & (1 << 3))
-	{
-		int n = pReader->ReadInt();
-		m_arrQuadPoints.reserve(n);
-		for (int i = 0; i < n; ++i)
-			m_arrQuadPoints.push_back(pReader->ReadDouble());
-	}
-}
-
 bool CAnnotFieldInfo::CPopupAnnotPr::IsOpen()      const { return m_bOpen; }
 int  CAnnotFieldInfo::CPopupAnnotPr::GetFlag()     const { return m_nFlag; }
 int  CAnnotFieldInfo::CPopupAnnotPr::GetParentID() const { return m_nParentID; }
@@ -892,7 +752,7 @@ const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetFontKey()   { return m_w
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetTC() { return m_arrTC; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetBC() { return m_arrBC; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetBG() { return m_arrBG; }
-const std::vector<CAnnotFieldInfo::CActionFieldPr*>& CAnnotFieldInfo::CWidgetAnnotPr::GetActions() { return m_arrAction; }
+const std::vector<CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget*>& CAnnotFieldInfo::CWidgetAnnotPr::GetActions() { return m_arrAction; }
 CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr*    CAnnotFieldInfo::CWidgetAnnotPr::GetButtonWidgetPr()    { return m_pButtonPr; }
 CAnnotFieldInfo::CWidgetAnnotPr::CTextWidgetPr*      CAnnotFieldInfo::CWidgetAnnotPr::GetTextWidgetPr()      { return m_pTextPr; }
 CAnnotFieldInfo::CWidgetAnnotPr::CChoiceWidgetPr*    CAnnotFieldInfo::CWidgetAnnotPr::GetChoiceWidgetPr()    { return m_pChoicePr; }
@@ -952,8 +812,93 @@ CAnnotFieldInfo::CWidgetAnnotPr::~CWidgetAnnotPr()
 		RELEASEOBJECT(m_arrAction[i]);
 }
 
-CAnnotFieldInfo::CActionFieldPr::CActionFieldPr() : pNext(NULL) {}
-CAnnotFieldInfo::CActionFieldPr::~CActionFieldPr() { RELEASEOBJECT(pNext); }
+CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget::CActionWidget() : pNext(NULL) {}
+CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget::~CActionWidget() { RELEASEOBJECT(pNext); }
+CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* ReadAction(NSOnlineOfficeBinToPdf::CBufferReader* pReader)
+{
+	CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pRes = new CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget();
+
+	pRes->nActionType = pReader->ReadByte();
+	switch (pRes->nActionType)
+	{
+	case 14: // JavaScript
+	{
+		pRes->wsStr1 = pReader->ReadString();
+		break;
+	}
+	case 1: // GoTo
+	{
+		pRes->nInt1 = pReader->ReadInt();
+		pRes->nKind = pReader->ReadByte();
+		switch (pRes->nKind)
+		{
+		case 0:
+		case 2:
+		case 3:
+		case 6:
+		case 7:
+		{
+			pRes->nFlags = pReader->ReadByte();
+			if (pRes->nFlags & (1 << 0))
+				pRes->dD[0] = pReader->ReadDouble();
+			if (pRes->nFlags & (1 << 1))
+				pRes->dD[1] = pReader->ReadDouble();
+			if (pRes->nFlags & (1 << 2))
+				pRes->dD[2] = pReader->ReadDouble();
+			break;
+		}
+		case 4:
+		{
+			pRes->dD[0] = pReader->ReadDouble();
+			pRes->dD[1] = pReader->ReadDouble();
+			pRes->dD[2] = pReader->ReadDouble();
+			pRes->dD[3] = pReader->ReadDouble();
+			break;
+		}
+		case 1:
+		case 5:
+		default:
+		{
+			break;
+		}
+		}
+		break;
+	}
+	case 10: // Named
+	{
+		pRes->wsStr1 = pReader->ReadString();
+		break;
+	}
+	case 6: // URI
+	{
+		pRes->wsStr1 = pReader->ReadString();
+		break;
+	}
+	case 9: // Hide
+	{
+		pRes->nKind = pReader->ReadByte();
+		int n = pReader->ReadInt();
+		pRes->arrStr.reserve(n);
+		for (int i = 0; i < n; ++i)
+			pRes->arrStr.push_back(pReader->ReadString());
+		break;
+	}
+	case 12: // ResetForm
+	{
+		pRes->nInt1 = pReader->ReadInt();
+		int n = pReader->ReadInt();
+		pRes->arrStr.reserve(n);
+		for (int i = 0; i < n; ++i)
+			pRes->arrStr.push_back(pReader->ReadString());
+		break;
+	}
+	}
+
+	if (pReader->ReadByte())
+		pRes->pNext = ReadAction(pReader);
+
+	return pRes;
+}
 void CAnnotFieldInfo::CWidgetAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, BYTE nType)
 {
 	m_wsFN = pReader->ReadString();
@@ -1012,7 +957,7 @@ void CAnnotFieldInfo::CWidgetAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader
 	for (int i = 0; i < nAction; ++i)
 	{
 		std::wstring wsType = pReader->ReadString();
-		CAnnotFieldInfo::CActionFieldPr* pA = ReadAction(pReader);
+		CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pA = ReadAction(pReader);
 		if (pA)
 		{
 			pA->wsType = wsType;
@@ -1042,7 +987,6 @@ const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetCA() {
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetRC() { return m_wsRC; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetAC() { return m_wsAC; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetAP_N_Yes() { return m_wsAP_N_Yes; }
-const std::vector< std::pair<std::wstring, std::wstring> >& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetOpt() { return m_arrOpt; }
 void CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, BYTE nType, int nFlags)
 {
 	if (nType == 27)
@@ -1083,17 +1027,6 @@ void CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::Read(NSOnlineOfficeBinToP
 		if (nFlags & (1 << 9))
 			m_wsV = pReader->ReadString();
 		m_nStyle = pReader->ReadByte();
-		if (nFlags & (1 << 10))
-		{
-			int n = pReader->ReadInt();
-			m_arrOpt.reserve(n);
-			for (int i = 0; i < n; ++i)
-			{
-				std::wstring s1 = pReader->ReadString();
-				std::wstring s2 = pReader->ReadString();
-				m_arrOpt.push_back(std::make_pair(s1, s2));
-			}
-		}
 		if (nFlags & (1 << 14))
 			m_wsAP_N_Yes = pReader->ReadString();
 	}
@@ -1259,7 +1192,7 @@ bool CWidgetsInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafil
 			for (int i = 0; i < nAction; ++i)
 			{
 				std::wstring wsType = pReader->ReadString();
-				CAnnotFieldInfo::CActionFieldPr* pA = ReadAction(pReader);
+				CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pA = ReadAction(pReader);
 				if (pA)
 				{
 					pA->wsType = wsType;

DesktopEditor/graphics/commands/AnnotField.h

@@ -70,23 +70,6 @@ public:
 		WidgetSignature = 33
 	};
 
-	class GRAPHICS_DECL CActionFieldPr
-	{
-	public:
-		CActionFieldPr();
-		~CActionFieldPr();
-
-		BYTE nKind;
-		BYTE nFlags;
-		BYTE nActionType;
-		int  nInt1;
-		double dD[4]{};
-		std::wstring wsType;
-		std::wstring wsStr1;
-		std::vector<std::wstring> arrStr;
-		CActionFieldPr* pNext;
-	};
-
 	class GRAPHICS_DECL CWidgetAnnotPr
 	{
 	public:
@@ -107,7 +90,6 @@ public:
 			const std::wstring& GetRC();
 			const std::wstring& GetAC();
 			const std::wstring& GetAP_N_Yes();
-			const std::vector< std::pair<std::wstring, std::wstring> >& GetOpt();
 
 			void Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, BYTE nType, int nFlags);
 
@@ -126,7 +108,6 @@ public:
 			std::wstring m_wsRC;
 			std::wstring m_wsAC;
 			std::wstring m_wsAP_N_Yes;
-			std::vector< std::pair<std::wstring, std::wstring> > m_arrOpt;
 		};
 
 		class GRAPHICS_DECL CTextWidgetPr
@@ -178,6 +159,23 @@ public:
 
 		};
 
+		class GRAPHICS_DECL CActionWidget
+		{
+		public:
+			CActionWidget();
+			~CActionWidget();
+
+			BYTE nKind;
+			BYTE nFlags;
+			BYTE nActionType;
+			int  nInt1;
+			double dD[4]{};
+			std::wstring wsType;
+			std::wstring wsStr1;
+			std::vector<std::wstring> arrStr;
+			CActionWidget* pNext;
+		};
+
 		CWidgetAnnotPr(BYTE nType);
 		~CWidgetAnnotPr();
 
@@ -201,7 +199,7 @@ public:
 		const std::vector<double>& GetTC();
 		const std::vector<double>& GetBC();
 		const std::vector<double>& GetBG();
-		const std::vector<CActionFieldPr*>& GetActions();
+		const std::vector<CActionWidget*>& GetActions();
 
 		CButtonWidgetPr*    GetButtonWidgetPr();
 		CTextWidgetPr*      GetTextWidgetPr();
@@ -231,7 +229,7 @@ public:
 		std::vector<double> m_arrTC;
 		std::vector<double> m_arrBC;
 		std::vector<double> m_arrBG;
-		std::vector<CActionFieldPr*> m_arrAction;
+		std::vector<CActionWidget*> m_arrAction;
 
 		CButtonWidgetPr*    m_pButtonPr;
 		CTextWidgetPr*      m_pTextPr;
@@ -391,7 +389,7 @@ public:
 	{
 	public:
 		bool IsOpen()      const;
-		int  GetFlag()    const;
+		int  GetFlag()     const;
 		int  GetParentID() const;
 
 		void Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader);
@@ -480,28 +478,6 @@ public:
 		std::vector<double> m_arrQuadPoints;
 	};
 
-	class GRAPHICS_DECL CLinkAnnotPr
-	{
-	public:
-		CLinkAnnotPr();
-		~CLinkAnnotPr();
-
-		BYTE GetH()    const;
-		int GetFlags() const;
-		const std::vector<double>& GetQuadPoints();
-		CActionFieldPr* GetA();
-		CActionFieldPr* GetPA();
-
-		void Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader);
-
-	private:
-		BYTE m_nH;
-		int m_nFlags;
-		std::vector<double> m_arrQuadPoints;
-		CActionFieldPr* m_pAction;
-		CActionFieldPr* m_pPA;
-	};
-
 	CAnnotFieldInfo();
 	virtual ~CAnnotFieldInfo();
 
@@ -542,7 +518,6 @@ public:
 	bool IsCaret()           const;
 	bool IsStamp()           const;
 	bool IsRedact()          const;
-	bool IsLink()            const;
 
 	CMarkupAnnotPr*       GetMarkupAnnotPr();
 	CTextAnnotPr*         GetTextAnnotPr();
@@ -556,7 +531,6 @@ public:
 	CCaretAnnotPr*        GetCaretAnnotPr();
 	CStampAnnotPr*        GetStampAnnotPr();
 	CRedactAnnotPr*       GetRedactAnnotPr();
-	CLinkAnnotPr*         GetLinkAnnotPr();
 	CWidgetAnnotPr*       GetWidgetAnnotPr();
 
 	bool Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector);
@@ -602,7 +576,6 @@ private:
 	CCaretAnnotPr*        m_pCaretPr;
 	CStampAnnotPr*        m_pStampPr;
 	CRedactAnnotPr*       m_pRedactPr;
-	CLinkAnnotPr*         m_pLinkPr;
 	CWidgetAnnotPr*       m_pWidgetPr;
 };
 
@@ -637,7 +610,7 @@ public:
 		std::wstring sTU;
 		std::vector<int> arrI;
 		std::vector<std::wstring> arrV;
-		std::vector<CAnnotFieldInfo::CActionFieldPr*> arrAction;
+		std::vector<CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget*> arrAction;
 		std::vector< std::pair<std::wstring, std::wstring> > arrOpt;
 	};
 

DesktopEditor/graphics/pro/js/drawingfile.json

@@ -46,7 +46,6 @@
 		"_InitializeFontsRanges",
 		"_SetFontBinary",
 		"_GetFontBinary",
-		"_GetGIDByUnicode",
 		"_IsFontBinaryExist",
 		"_DestroyTextInfo",
 		"_IsNeedCMap",

DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js

@@ -362,11 +362,6 @@ CFile.prototype["getFontByID"] = function(ID)
 	return this._getFontByID(ID);
 };
 
-CFile.prototype["getGIDByUnicode"] = function(ID)
-{
-	return this._getGIDByUnicode(ID);
-};
-
 CFile.prototype["setCMap"] = function(memoryBuffer)
 {
 	if (!this.nativeFile)
@@ -426,9 +421,9 @@ function readAction(reader, rec, readDoubleFunc, readStringFunc)
 			case 4:
 			{
 				rec["left"]   = readDoubleFunc.call(reader);
-				rec["top"] = readDoubleFunc.call(reader);
+				rec["bottom"] = readDoubleFunc.call(reader);
 				rec["right"]  = readDoubleFunc.call(reader);
-				rec["bottom"]    = readDoubleFunc.call(reader);
+				rec["top"]    = readDoubleFunc.call(reader);
 				break;
 			}
 			case 1:
@@ -1040,33 +1035,6 @@ function readAnnotType(reader, rec, readDoubleFunc, readDouble2Func, readStringF
 			rec["font"]["style"] = reader.readInt();
 		}
 	}
-	// Link
-	else if (rec["type"] == 1)
-	{
-		flags = reader.readInt();
-		if (flags & (1 << 0))
-		{
-			rec["A"] = {};
-			readAction(reader, rec["A"], readDoubleFunc, readStringFunc);
-		}
-		if (flags & (1 << 1))
-		{
-			rec["PA"] = {};
-			readAction(reader, rec["PA"], readDoubleFunc, readStringFunc);
-		}
-		// Selection mode - H
-		// 0 - none, 1 - invert, 2 - push, 3 - outline
-		if (flags & (1 << 2))
-			rec["highlight"] = reader.readByte();
-		// QuadPoints
-		if (flags & (1 << 3))
-		{
-			let n = reader.readInt();
-			rec["QuadPoints"] = [];
-			for (let i = 0; i < n; ++i)
-				rec["QuadPoints"].push(readDoubleFunc.call(reader));
-		}
-	}
 }
 function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readStringFunc, isRead = false)
 {
@@ -1211,20 +1179,6 @@ function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readString
 			rec["value"] = readStringFunc.call(reader);
 		// 0 - check, 1 - cross, 2 - diamond, 3 - circle, 4 - star, 5 - square
 		rec["style"] = reader.readByte();
-		if (flags & (1 << 10))
-		{
-			let n = reader.readInt();
-			rec["opt"] = [];
-			for (let i = 0; i < n; ++i)
-			{
-				let opt1 = readStringFunc.call(reader);
-				let opt2 = readStringFunc.call(reader);
-				if (opt1 == "")
-					rec["opt"].push(opt2);
-				else
-					rec["opt"].push([opt2, opt1]);
-			}
-		}
 		if (flags & (1 << 14))
 			rec["ExportValue"] = readStringFunc.call(reader);
 		// 12.7.4.2.1

DesktopEditor/graphics/pro/js/wasm/js/drawingfile_native.js

@@ -172,12 +172,6 @@ CFile.prototype._getFontByID = function(ID)
 	return g_native_drawing_file["GetFontBinary"](ID);
 };
 
-CFile.prototype._getGIDByUnicode = function(ID)
-{
-	g_module_pointer.ptr = g_native_drawing_file["GetGIDByUnicode"](ID);
-	return g_module_pointer;
-}
-
 CFile.prototype._getInteractiveFormsFonts = function(type)
 {
 	g_module_pointer.ptr = g_native_drawing_file["GetInteractiveFormsFonts"](type);

DesktopEditor/graphics/pro/js/wasm/js/drawingfile_wasm.js

@@ -286,34 +286,6 @@ CFile.prototype._getFontByID = function(ID)
 	return res;
 };
 
-CFile.prototype._getGIDByUnicode = function(ID)
-{
-	if (ID === undefined)
-		return null;
-
-	let idBuffer = ID.toUtf8();
-	let idPointer = Module["_malloc"](idBuffer.length);
-	Module["HEAP8"].set(idBuffer, idPointer);
-	g_module_pointer.ptr = Module["_GetGIDByUnicode"](this.nativeFile, idPointer);
-	Module["_free"](idPointer);
-
-	let reader = g_module_pointer.getReader();
-	if (!reader)
-		return null;
-
-	let res = {};
-	let nFontLength = reader.readInt();
-	for (let i = 0; i < nFontLength; i++)
-	{
-		let np1 = reader.readInt();
-		let np2 = reader.readInt();
-		res[np2] = np1;
-	}
-
-	g_module_pointer.free();
-	return res;
-}
-
 CFile.prototype._getInteractiveFormsFonts = function(type)
 {
 	g_module_pointer.ptr = Module["_GetInteractiveFormsFonts"](this.nativeFile, type);

DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp

@@ -150,10 +150,6 @@ WASM_EXPORT BYTE* GetFontBinary(CDrawingFile* pFile, char* path)
 {
 	return pFile->GetFontBinary(std::string(path));
 }
-WASM_EXPORT BYTE* GetGIDByUnicode(CDrawingFile* pFile, char* path)
-{
-	return pFile->GetGIDByUnicode(std::string(path));
-}
 WASM_EXPORT void DestroyTextInfo(CDrawingFile* pFile)
 {
 	return pFile->DestroyTextInfo();

DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp

@@ -704,23 +704,6 @@ void ReadInteractiveForms(BYTE* pWidgets, int& i)
 			i += 1;
 			std::cout << "Style " << arrStyle[nPathLength] << ", ";
 
-			if (nFlags & (1 << 10))
-			{
-				int nOptLength = READ_INT(pWidgets + i);
-				i += 4;
-				for (int j = 0; j < nOptLength; ++j)
-				{
-					nPathLength = READ_INT(pWidgets + i);
-					i += 4;
-					std::cout << std::to_string(j) << " Opt1 " << std::string((char*)(pWidgets + i), nPathLength) << ", ";
-					i += nPathLength;
-
-					nPathLength = READ_INT(pWidgets + i);
-					i += 4;
-					std::cout << std::to_string(j) << " Opt2 " << std::string((char*)(pWidgets + i), nPathLength) << ", ";
-					i += nPathLength;
-				}
-			}
 			if (nFlags & (1 << 14))
 			{
 				nPathLength = READ_INT(pWidgets + i);
@@ -955,36 +938,6 @@ void ReadInteractiveFormsFonts(CDrawingFile* pGrFile, int nType)
 				std::cout << "font" << j << ".txt";
 			}
 
-			if (pFont)
-				free(pFont);
-
-			if (false)
-				continue;
-
-			pFont = GetGIDByUnicode(pGrFile, (char*)sFontName.c_str());
-			nLength2 = READ_INT(pFont);
-			i2 = 4;
-			nLength2 -= 4;
-
-			while (i2 < nLength2)
-			{
-				int nFontLength = READ_INT(pFont + i2);
-				i2 += 4;
-
-				std::cout << std::endl << "CIDtoUnicode" << std::endl;
-
-				for (int j = 0; j < nFontLength; ++j)
-				{
-					unsigned int code = READ_INT(pFont + i2);
-					i2 += 4;
-					unsigned int unicode = READ_INT(pFont + i2);
-					i2 += 4;
-					std::cout << "cid\t" << code << "\tunicode\t" << unicode << std::endl;
-				}
-
-				std::cout << std::endl;
-			}
-
 			if (pFont)
 				free(pFont);
 		}
@@ -1193,17 +1146,17 @@ int main(int argc, char* argv[])
 			std::cout << "Redact false" << std::endl;
 	}
 
-	// RASTER
-	if (true)
+	int i = nTestPage;
+	//for (int i = 0; i < nPagesCount; ++i)
 	{
-		int i = nTestPage;
-		//for (int i = 0; i < nPagesCount; ++i)
+		// RASTER
+		if (true)
 		{
 			nWidth  = READ_INT(pInfo + i * 16 + 12);
 			nHeight = READ_INT(pInfo + i * 16 + 16);
 
-			//nWidth  *= 2;
-			//nHeight *= 2;
+			//nWidth  *= 3;
+			//nHeight *= 3;
 
 			BYTE* res = NULL;
 			res = GetPixmap(pGrFile, i, nWidth, nHeight, 0xFFFFFF);
@@ -2191,44 +2144,6 @@ int main(int argc, char* argv[])
 						std::cout << nPathLength << ", ";
 					}
 				}
-				else if (sType == "Link")
-				{
-					nFlags = READ_INT(pAnnots + i);
-					i += 4;
-					if (nFlags & (1 << 0))
-					{
-						std::cout << std::endl << "A ";
-						ReadAction(pAnnots, i);
-						std::cout << std::endl;
-					}
-					if (nFlags & (1 << 1))
-					{
-						std::cout << std::endl << "PA ";
-						ReadAction(pAnnots, i);
-						std::cout << std::endl;
-					}
-					if (nFlags & (1 << 2))
-					{
-						std::string arrHighlighting[] = {"none", "invert", "push", "outline"};
-						nPathLength = READ_BYTE(pAnnots + i);
-						i += 1;
-						std::cout << "Highlight " << arrHighlighting[nPathLength] << ", ";
-					}
-					if (nFlags & (1 << 3))
-					{
-						std::cout << "QuadPoints";
-						int nQuadPointsLength = READ_INT(pAnnots + i);
-						i += 4;
-
-						for (int j = 0; j < nQuadPointsLength; ++j)
-						{
-							nPathLength = READ_INT(pAnnots + i);
-							i += 4;
-							std::cout << " " << (double)nPathLength / 100.0;
-						}
-						std::cout << ", ";
-					}
-				}
 
 				std::cout << std::endl << "]" << std::endl;
 			}
@@ -2254,12 +2169,9 @@ int main(int argc, char* argv[])
 	// SCAN PAGE
 	if (false)
 	{
-		BYTE* pScan = ScanPage(pGrFile, nTestPage, 2);
+		BYTE* pScan = ScanPage(pGrFile, nTestPage, 1);
 		if (pScan)
 			free(pScan);
-
-		ReadInteractiveFormsFonts(pGrFile, 1);
-		ReadInteractiveFormsFonts(pGrFile, 2);
 	}
 
 	Close(pGrFile);

DesktopEditor/raster/Metafile/svg/SvgObjects/CMarker.cpp

@@ -8,8 +8,8 @@ namespace SVG
 		: CObject(oReader), m_enUnits{EMarkerUnits::StrokeWidth}, m_enOrient{EMarkerOrient::Angle},
 	      m_dAngle(0.), m_oBounds{0., 0., 0., 0.}
 	{
-		m_oWindow.m_oWidth.SetValue(3, NSCSS::Pixel);
-		m_oWindow.m_oHeight.SetValue(3, NSCSS::Pixel);
+		m_oWindow.m_oWidth.SetValue(3);
+		m_oWindow.m_oHeight.SetValue(3);
 	}
 
 	ObjectType CMarker::GetType() const

DesktopEditor/raster/Metafile/svg/SvgObjects/CObjectBase.cpp

@@ -153,7 +153,7 @@ namespace SVG
 
 	bool CObject::ApplyClip(IRenderer *pRenderer, const TClip *pClip, const CSvgFile *pFile, const TBounds &oBounds) const
 	{
-		if (NULL == pRenderer || NULL == pClip || NULL == pFile || pClip->m_oHref.Empty() || NSCSS::NSProperties::EColorType::ColorUrl != pClip->m_oHref.GetType())
+		if (NULL == pRenderer || NULL == pClip || NULL == pFile || pClip->m_oHref.Empty() || NSCSS::NSProperties::ColorType::ColorUrl != pClip->m_oHref.GetType())
 			return false;
 
 		if (pClip->m_oRule == L"evenodd")
@@ -169,7 +169,7 @@ namespace SVG
 
 	bool CObject::ApplyMask(IRenderer *pRenderer, const NSCSS::NSProperties::CColor *pMask, const CSvgFile *pFile, const TBounds &oBounds) const
 	{
-		if (NULL == pRenderer || NULL == pMask || NULL == pFile || NSCSS::NSProperties::EColorType::ColorUrl != pMask->GetType())
+		if (NULL == pRenderer || NULL == pMask || NULL == pFile || NSCSS::NSProperties::ColorType::ColorUrl != pMask->GetType())
 			return false;
 
 		return ApplyDef(pRenderer, pFile, pMask->ToWString(), oBounds);
@@ -358,7 +358,7 @@ namespace SVG
 
 	bool CRenderedObject::ApplyStroke(IRenderer *pRenderer, const TStroke *pStroke, bool bUseDefault, const CRenderedObject* pContextObject) const
 	{
-		if (NULL == pRenderer || NULL == pStroke || NSCSS::NSProperties::EColorType::ColorNone == pStroke->m_oColor.GetType() || (!bUseDefault && ((pStroke->m_oWidth.Empty() || pStroke->m_oWidth.Zero()) && pStroke->m_oColor.Empty())))
+		if (NULL == pRenderer || NULL == pStroke || NSCSS::NSProperties::ColorType::ColorNone == pStroke->m_oColor.GetType() || (!bUseDefault && ((pStroke->m_oWidth.Empty() || pStroke->m_oWidth.Zero()) && pStroke->m_oColor.Empty())))
 		{
 			pRenderer->put_PenSize(0);
 			return false;
@@ -369,12 +369,12 @@ namespace SVG
 		if (Equals(0., dStrokeWidth))
 			dStrokeWidth = 1.;
 
-		if (NSCSS::NSProperties::EColorType::ColorContextFill == pStroke->m_oColor.GetType() && NULL != pContextObject)
+		if (NSCSS::NSProperties::ColorType::ColorContextFill == pStroke->m_oColor.GetType() && NULL != pContextObject)
 			pRenderer->put_PenColor(pContextObject->m_oStyles.m_oFill.ToInt());
-		else if (NSCSS::NSProperties::EColorType::ColorContextStroke == pStroke->m_oColor.GetType() && NULL != pContextObject)
+		else if (NSCSS::NSProperties::ColorType::ColorContextStroke == pStroke->m_oColor.GetType() && NULL != pContextObject)
 			pRenderer->put_PenColor(pContextObject->m_oStyles.m_oStroke.m_oColor.ToInt());
 		else
-			pRenderer->put_PenColor((pStroke->m_oColor.Empty() || NSCSS::NSProperties::EColorType::ColorNone == pStroke->m_oColor.GetType()) ? 0 : pStroke->m_oColor.ToInt());
+			pRenderer->put_PenColor((pStroke->m_oColor.Empty() || NSCSS::NSProperties::ColorType::ColorNone == pStroke->m_oColor.GetType()) ? 0 : pStroke->m_oColor.ToInt());
 
 		pRenderer->put_PenSize(dStrokeWidth);
 		pRenderer->put_PenAlpha(255. * pStroke->m_oColor.GetOpacity());
@@ -401,18 +401,18 @@ namespace SVG
 
 	bool CRenderedObject::ApplyFill(IRenderer *pRenderer, const NSCSS::NSProperties::CColor *pFill, const CSvgFile *pFile, bool bUseDefault, const CRenderedObject* pContextObject) const
 	{
-		if (NULL == pRenderer || NULL == pFill || NSCSS::NSProperties::EColorType::ColorNone == pFill->GetType() || (!bUseDefault && pFill->Empty()))
+		if (NULL == pRenderer || NULL == pFill || NSCSS::NSProperties::ColorType::ColorNone == pFill->GetType() || (!bUseDefault && pFill->Empty()))
 		{
 			pRenderer->put_BrushType(c_BrushTypeNoFill);
 			return false;
 		}
-		else if (NSCSS::NSProperties::EColorType::ColorHEX == pFill->GetType() ||
-				 NSCSS::NSProperties::EColorType::ColorRGB == pFill->GetType())
+		else if (NSCSS::NSProperties::ColorType::ColorHEX == pFill->GetType() ||
+				 NSCSS::NSProperties::ColorType::ColorRGB == pFill->GetType())
 		{
 			pRenderer->put_BrushColor1((pFill->Empty() && bUseDefault) ? 0 : pFill->ToInt());
 			pRenderer->put_BrushType(c_BrushTypeSolid);
 		}
-		else if (NSCSS::NSProperties::EColorType::ColorUrl == pFill->GetType())
+		else if (NSCSS::NSProperties::ColorType::ColorUrl == pFill->GetType())
 		{
 			if (!ApplyDef(pRenderer, pFile, pFill->ToWString(), GetBounds()))
 			{
@@ -425,16 +425,10 @@ namespace SVG
 					return false;
 			}
 		}
-		else if (NSCSS::NSProperties::EColorType::ColorContextFill == pFill->GetType() && NULL != pContextObject)
-		{
-			if (!ApplyFill(pRenderer, &pContextObject->m_oStyles.m_oFill, pFile, bUseDefault, pContextObject))
-				return false;
-		}
-		else if (NSCSS::NSProperties::EColorType::ColorContextStroke == pFill->GetType() && NULL != pContextObject)
-		{
-			if (!ApplyFill(pRenderer, &pContextObject->m_oStyles.m_oStroke.m_oColor, pFile, bUseDefault, pContextObject))
-				return false;
-		}
+		else if (NSCSS::NSProperties::ColorType::ColorContextFill == pFill->GetType() && NULL != pContextObject)
+			pRenderer->put_BrushColor1(pContextObject->m_oStyles.m_oFill.ToInt());
+		else if (NSCSS::NSProperties::ColorType::ColorContextStroke == pFill->GetType() && NULL != pContextObject)
+			pRenderer->put_BrushColor1(pContextObject->m_oStyles.m_oStroke.m_oColor.ToInt());
 		else if (bUseDefault)
 		{
 			pRenderer->put_BrushColor1(0);

DesktopEditor/raster/Metafile/svg/SvgObjects/CPath.cpp

@@ -566,7 +566,7 @@ namespace SVG
 
 		#define CALCULATE_ANGLE(firstPoint, secondPoint) std::atan2(secondPoint.dY - firstPoint.dY, secondPoint.dX - firstPoint.dX) * 180. / M_PI
 
-		if (!m_oMarkers.m_oStart.Empty() && NSCSS::NSProperties::EColorType::ColorUrl == m_oMarkers.m_oStart.GetType())
+		if (!m_oMarkers.m_oStart.Empty() && NSCSS::NSProperties::ColorType::ColorUrl == m_oMarkers.m_oStart.GetType())
 		{
 			CMarker *pStartMarker = dynamic_cast<CMarker*>(pFile->GetMarkedObject(m_oMarkers.m_oStart.ToWString()));
 
@@ -610,7 +610,7 @@ namespace SVG
 			}
 		}
 
-		if (!m_oMarkers.m_oMid.Empty() && NSCSS::NSProperties::EColorType::ColorUrl == m_oMarkers.m_oMid.GetType())
+		if (!m_oMarkers.m_oMid.Empty() && NSCSS::NSProperties::ColorType::ColorUrl == m_oMarkers.m_oMid.GetType())
 		{
 			CMarker *pMidMarker = dynamic_cast<CMarker*>(pFile->GetMarkedObject(m_oMarkers.m_oMid.ToWString()));
 
@@ -638,7 +638,7 @@ namespace SVG
 			}
 		}
 
-		if (!m_oMarkers.m_oEnd.Empty() && NSCSS::NSProperties::EColorType::ColorUrl == m_oMarkers.m_oEnd.GetType())
+		if (!m_oMarkers.m_oEnd.Empty() && NSCSS::NSProperties::ColorType::ColorUrl == m_oMarkers.m_oEnd.GetType())
 		{
 			CMarker *pEndMarker = dynamic_cast<CMarker*>(pFile->GetMarkedObject(m_oMarkers.m_oEnd.ToWString()));
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CText.cpp

@@ -110,9 +110,6 @@ namespace SVG
 		if (mAttributes.end() != mAttributes.find(L"text-decoration"))
 			m_oText.SetDecoration(mAttributes.at(L"text-decoration"), ushLevel, bHardMode);
 
-		if (mAttributes.end() != mAttributes.find(L"baseline-shift"))
-			m_oText.SetBaselineShift(mAttributes.at(L"baseline-shift"), ushLevel, bHardMode);
-
 		//POSITION
 		if (mAttributes.end() != mAttributes.find(L"rotate"))
 		{
@@ -244,27 +241,7 @@ namespace SVG
 		std::wstring wsFontFamily = DefaultFontFamily;
 		double dFontSize = ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE) * 72. / 25.4;
 
-		double dScaleX = 1., dScaleY = 1.;
-
-		NormalizeFontSize(dFontSize, dScaleX, dScaleY);
-
-		if (!Equals(1., dScaleX) || !Equals(1., dScaleY))
-		{
-			dX /= dScaleX;
-			dY /= dScaleY;
-
-			double dM11, dM12, dM21, dM22, dDx, dDy;
-
-			pRenderer->GetTransform(&dM11, &dM12, &dM21, &dM22, &dDx, &dDy);
-
-			oOldMatrix.SetElements(dM11, dM12, dM21, dM22, dDx, dDy);
-
-			Aggplus::CMatrix oMatrix(dM11, dM12, dM21, dM22, dDx, dDy);
-
-			oMatrix.Scale(dScaleX, dScaleY);
-
-			pRenderer->SetTransform(oMatrix.sx(), oMatrix.shy(), oMatrix.shx(), oMatrix.sy(), oMatrix.tx(), oMatrix.ty());
-		}
+		Normalize(pRenderer, dX, dY, dFontSize, oOldMatrix);
 
 		if (!m_oFont.GetFamily().Empty())
 		{
@@ -294,12 +271,12 @@ namespace SVG
 			m_pFontManager->LoadFontByName(wsFontFamily, dFontSize, nStyle, 72., 72.);
 			m_pFontManager->SetCharSpacing(0);
 
-			const double dKoef = 25.4 / 72.;
+			double dKoef     = 25.4 / 72.;
 
 			NSFonts::IFontFile* pFontFile = m_pFontManager->GetFile();
 
 			if (pFontFile)
-				dFHeight *= pFontFile->GetHeight() / pFontFile->Units_Per_Em() * dKoef;
+				dFHeight  *= pFontFile->GetHeight() / pFontFile->Units_Per_Em() * dKoef;
 
 			m_pFontManager->LoadString1(m_wsText, 0, 0);
 			TBBox oBox = m_pFontManager->MeasureString2();
@@ -322,45 +299,6 @@ namespace SVG
 		else if (L"center" == m_oText.GetAlign().ToWString())
 			dX += -fW / 2;
 
-		if (NSCSS::NSProperties::EBaselineShift::Baseline != m_oText.GetBaselineShiftType())
-		{
-			switch(m_oText.GetBaselineShiftType())
-			{
-				case NSCSS::NSProperties::Sub:
-				{
-					dY += dFHeight / 2.;
-					break;
-				}
-				case NSCSS::NSProperties::Super:
-				{
-					double dParentHeight{dFHeight};
-
-					if (nullptr != m_pParent)
-						dParentHeight = ((CTSpan*)m_pParent)->GetFontHeight() / dScaleY;
-
-					dY -= dParentHeight - dFHeight / 2.;
-					break;
-				}
-				case NSCSS::NSProperties::Percentage:
-				{
-					double dParentHeight{dFHeight};
-
-					if (nullptr != m_pParent)
-						dParentHeight = ((CTSpan*)m_pParent)->GetFontHeight() / dScaleY;
-
-					dY -= dParentHeight * (m_oText.GetBaselineShiftValue() / 100.);
-					break;
-				}
-				case NSCSS::NSProperties::Length:
-				{
-					dY -= m_oText.GetBaselineShiftValue() / dScaleY;
-					break;
-				}
-				default:
-					break;
-			}
-		}
-
 		if (m_oText.Underline() || m_oText.LineThrough() || m_oText.Overline())
 		{
 			pRenderer->put_PenSize((double)fUndSize);
@@ -451,7 +389,7 @@ namespace SVG
 		oBounds.m_dRight  = oBounds.m_dLeft + GetWidth();
 
 		oBounds.m_dBottom = m_oY.ToDouble(NSCSS::Pixel);
-		oBounds.m_dTop    = oBounds.m_dBottom - ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE);
+		oBounds.m_dTop    = oBounds.m_dBottom + ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE);
 
 		if (nullptr != pTransform)
 		{
@@ -546,33 +484,56 @@ namespace SVG
 		dY = m_oY.ToDouble(NSCSS::Pixel, oBounds.m_dBottom - oBounds.m_dTop);
 	}
 
-	void CTSpan::NormalizeFontSize(double& dFontHeight, double& dScaleX, double& dScaleY) const
+	void CTSpan::Normalize(IRenderer *pRenderer, double &dX, double &dY, double &dFontHeight, Aggplus::CMatrix& oOldMatrix) const
 	{
+		if (NULL == pRenderer)
+			return;
+
 		Aggplus::CMatrix oCurrentMatrix(m_oTransformation.m_oTransform.GetMatrix().GetFinalValue());
 
+		double dXScale = 1., dYScale = 1.;
+
 		const double dModuleM11 = std::abs(oCurrentMatrix.sx());
 		const double dModuleM22 = std::abs(oCurrentMatrix.sy());
 
 		if (!ISZERO(dModuleM11) && (dModuleM11 < MIN_SCALE || dModuleM11 > MAX_SCALE))
-			dScaleX /= dModuleM11;
+			dXScale /= dModuleM11;
 
 		if (!ISZERO(dModuleM22) && (dModuleM22 < MIN_SCALE || dModuleM22 > MAX_SCALE))
-			dScaleY /= dModuleM22;
+			dYScale /= dModuleM22;
 
-		dFontHeight *= dScaleY;
+		dFontHeight *= dYScale;
 
 		if (!Equals(0., dFontHeight) && dFontHeight < MIN_FONT_SIZE)
 		{
-			dScaleX *= MIN_FONT_SIZE / dFontHeight;
-			dScaleY *= MIN_FONT_SIZE / dFontHeight;
+			dXScale *= MIN_FONT_SIZE / dFontHeight;
+			dYScale *= MIN_FONT_SIZE / dFontHeight;
 			dFontHeight = MIN_FONT_SIZE;
 		}
 		else if (!Equals(0., dFontHeight) && dFontHeight > MAX_FONT_SIZE)
 		{
-			dScaleX *= dFontHeight / MAX_FONT_SIZE;
-			dScaleY *= dFontHeight / MAX_FONT_SIZE;
+			dXScale *= dFontHeight / MAX_FONT_SIZE;
+			dYScale *= dFontHeight / MAX_FONT_SIZE;
 			dFontHeight = MAX_FONT_SIZE;
 		}
+
+		if (Equals(1., dXScale) && Equals(1., dYScale))
+			return;
+
+		dX /= dXScale;
+		dY /= dYScale;
+
+		double dM11, dM12, dM21, dM22, dDx, dDy;
+
+		pRenderer->GetTransform(&dM11, &dM12, &dM21, &dM22, &dDx, &dDy);
+
+		oOldMatrix.SetElements(dM11, dM12, dM21, dM22, dDx, dDy);
+
+		Aggplus::CMatrix oMatrix(dM11, dM12, dM21, dM22, dDx, dDy);
+
+		oMatrix.Scale(dXScale, dYScale);
+
+		pRenderer->SetTransform(oMatrix.sx(), oMatrix.shy(), oMatrix.shx(), oMatrix.sy(), oMatrix.tx(), oMatrix.ty());
 	}
 
 	void CTSpan::SetPosition(const Point &oPosition)
@@ -608,40 +569,6 @@ namespace SVG
 
 	}
 
-	double CTSpan::GetFontHeight() const
-	{
-
-		if (NULL == m_pFontManager)
-			return ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE) * 72. / 25.4;
-
-		std::wstring wsFontFamily = DefaultFontFamily;
-		double dFontSize = ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE) * 72. / 25.4;
-
-		if (!m_oFont.GetFamily().Empty())
-		{
-			wsFontFamily = m_oFont.GetFamily().ToWString();
-			CorrectFontFamily(wsFontFamily);
-		}
-
-		int nStyle = 0;
-
-		if (m_oFont.GetWeight().ToWString() == L"bold")
-			nStyle |= 0x01;
-		if (m_oFont.GetStyle() .ToWString() == L"italic")
-			nStyle |= 0x02;
-		if (m_oText.Underline())
-			nStyle |= (1 << 2);
-
-		// Вычиления размеров текста
-		m_pFontManager->LoadFontByName(wsFontFamily, dFontSize, nStyle, 72., 72.);
-		m_pFontManager->SetCharSpacing(0);
-
-		m_pFontManager->LoadString1(m_wsText, 0, 0);
-		TBBox oBox = m_pFontManager->MeasureString2();
-
-		return (double)(25.4f / 72.f * (oBox.fMaxY - oBox.fMinY));
-	}
-
 	std::vector<CTSpan> CTSpan::Split() const
 	{
 		std::vector<CTSpan> arGlyphs;

DesktopEditor/raster/Metafile/svg/SvgObjects/CText.h

@@ -44,13 +44,11 @@ namespace SVG
 
 		void CalculatePosition(double& dX, double& dY) const;
 
-		void NormalizeFontSize(double& dFontHeight, double& dScaleX, double& dScaleY) const;
+		void Normalize(IRenderer* pRenderer, double& dX, double& dY, double& dFontHeight, Aggplus::CMatrix& oOldMatrix) const;
 		void SetPosition(const Point& oPosition);
 
 		void SetPositionFromParent(CRenderedObject* pParent);
 
-		double GetFontHeight() const;
-
 		std::vector<CTSpan> Split() const;
 
 		NSFonts::IFontManager* m_pFontManager;

DesktopEditor/xmlsec/src/src/Certificate_oform.h

@@ -72,6 +72,11 @@ public:
 	}
 
 public:
+	bool Sign(unsigned char* pData, unsigned int nSize, unsigned char*& pDataDst, unsigned int& nSizeDst)
+	{
+		return false;
+	}
+
 	std::string Sign(unsigned char* pData, unsigned int nSize)
 	{
 		NSOpenSSL::CMemoryData data = NSOpenSSL::Sign(pData, (int)nSize, m_pem_key);

DesktopEditor/xmlsec/src/wasm/extension/after.py

@@ -0,0 +1,13 @@
+import sys;
+sys.path.append("../../../../../../build_tools/scripts");
+import base;
+
+base.replaceInFile("./deploy/engine.js", "__ATPOSTRUN__=[];", "__ATPOSTRUN__=[function(){window.cryptoJS.onLoad();}];");
+base.replaceInFile("./deploy/engine.js", "__ATPOSTRUN__ = [];", "__ATPOSTRUN__=[function(){window.cryptoJS.onLoad();}];");
+base.replaceInFile("./deploy/engine.js", "function getBinaryPromise()", "function getBinaryPromise2()");
+
+base.replaceInFile("./deploy/engine_ie.js", "__ATPOSTRUN__=[];", "__ATPOSTRUN__=[function(){window.cryptoJS.onLoad();}];");
+base.replaceInFile("./deploy/engine_ie.js", "__ATPOSTRUN__ = [];", "__ATPOSTRUN__=[function(){window.cryptoJS.onLoad();}];");
+base.replaceInFile("./deploy/engine_ie.js", "function getBinaryPromise()", "function getBinaryPromise2()");
+
+base.delete_file("./engine.wasm.js")

DesktopEditor/xmlsec/src/wasm/extension/before.py

@@ -0,0 +1,7 @@
+import sys
+sys.path.append("../../../../../../build_tools/scripts")
+import base
+
+base.cmd_in_dir("./../3rdParty", sys.executable, ["openssl.py"])
+
+base.copy_file("./extension/engine.wasm.js", "./engine.wasm.js")

DesktopEditor/xmlsec/src/wasm/extension/engine.json

@@ -0,0 +1,56 @@
+{
+	"name": "engine",
+	"res_folder": "./deploy",
+	"wasm": true,
+	"asm": true,
+	"embed_mem_file": true,
+	"run_before": "before.py",
+	"run_after": "after.py",
+	"base_js_content": "./engine.wasm.js",
+
+	"compiler_flags": [
+		"-O3",
+		"-Wno-unused-command-line-argument",
+		"-s ALLOW_MEMORY_GROWTH=1",
+		"-s FILESYSTEM=0",
+		"-s ENVIRONMENT='web'",
+		"-s ASSERTIONS",
+		"-s LLD_REPORT_UNDEFINED",
+		"-s TOTAL_MEMORY=4MB"
+	],
+	"exported_functions": [
+		"_malloc",
+		"_free",
+		"_Crypto_Malloc",
+		"_Crypto_Free",
+		"_Crypto_CreateKeys",
+		"_Crypto_Sign",
+		"_Crypto_ChangePassword",
+		"_Crypto_Decrypt",
+		"_Crypto_Encrypt"
+	],
+	"include_path": [
+		"./../3rdParty/openssl/include", "./../3rdParty/openssl"
+	],
+	"define": [
+		"__linux__", "_LINUX"
+	],
+	"compile_files_array": [
+	{
+		"name": "a",
+		"folder": "../../../../common/",
+		"files": ["Base64.cpp", "File.cpp"]
+	},
+	{
+		"name": "b",
+		"folder": "../../../../../Common/3dParty/openssl/common/",
+		"files": ["common_openssl.cpp"]
+	},
+	{
+		"name": "c",
+		"folder": "./",
+		"files": ["main.cpp"]
+	}
+	],
+	"sources": ["./../3rdParty/openssl/libcrypto.a"]
+}

DesktopEditor/xmlsec/src/wasm/extension/extension.pro

@@ -0,0 +1,48 @@
+QT -= core gui
+
+TARGET = wasm
+TEMPLATE = app
+CONFIG += console
+CONFIG -= app_bundle
+
+DEFINES += TEST_AS_EXECUTABLE
+
+CORE_ROOT_DIR = $$PWD/../../../../..
+PWD_ROOT_DIR = $$PWD
+include($$CORE_ROOT_DIR/Common/base.pri)
+
+DEFINES += KERNEL_NO_USE_DYNAMIC_LIBRARY
+DEFINES += COMMON_OPENSSL_BUILDING_INTERNAL
+
+SOURCES += \
+$$CORE_ROOT_DIR/DesktopEditor/common/File.cpp \
+$$CORE_ROOT_DIR/DesktopEditor/common/Base64.cpp
+
+HEADERS += \
+	$$CORE_ROOT_DIR/DesktopEditor/xmlsec/src/include/Certificate.h \
+	$$CORE_ROOT_DIR/DesktopEditor/xmlsec/src/include/CertificateCommon.h
+
+SOURCES += \
+	$$CORE_ROOT_DIR/DesktopEditor/xmlsec/src/src/CertificateCommon.cpp
+
+DEFINES += SUPPORT_OFORM
+HEADERS += $$CORE_ROOT_DIR/DesktopEditor/xmlsec/src/src/Certificate_oform.h
+
+# OPENSSL
+CONFIG += open_ssl_common
+include($$CORE_ROOT_DIR/Common/3dParty/openssl/openssl.pri)
+
+core_windows {
+    LIBS += -lcrypt32
+    LIBS += -lcryptui
+    LIBS += -lAdvapi32
+    LIBS += -lws2_32
+    LIBS += -lUser32
+}
+
+core_linux {
+    LIBS += -ldl
+}
+
+# WASM EXPORT
+SOURCES += main.cpp

DesktopEditor/xmlsec/src/wasm/extension/extension/background_base.js

@@ -0,0 +1,24 @@
+function KeyStorage()
+{
+    
+}
+
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+    console.log("reseived in background:", message);
+
+    // Отображение всплывающего окна
+    chrome.action.openPopup();
+
+    // Посылаем событие обратно на страницу
+    if (sender.tab) {
+        chrome.scripting.executeScript({
+            target: { tabId: sender.tab.id },
+            func: (msg) => {
+                document.dispatchEvent(new CustomEvent("customEventFromExtension", { detail: msg }));
+            },
+            args: [message]
+        });
+    }
+
+    sendResponse({ status: "received" });
+});

DesktopEditor/xmlsec/src/wasm/extension/extension/content.js

@@ -0,0 +1,37 @@
+function sendEventToPage(id, data) {
+    document.dispatchEvent(new CustomEvent("olala", { detail: data }));
+}
+
+var ENGINE_VERSION = 1;
+var ENGINE_MESSAGE_CHECK = "onlyoffice-engine-check";
+var ENGINE_MESSAGE_DATA = "onlyoffice-engine-data";
+
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+    if (message.action === "popupMessage") {
+        console.log("Сообщение из popup:", message.text);
+
+        if (window.pluginEngine && window.pluginEngine.onMessageFromPlugin)
+            window.pluginEngine.onMessageFromPlugin(message);
+
+        sendResponse({ status: "Сообщение получено!" });
+
+        sendEventToPage({ message: "Привет от content.js" });
+    }
+});
+
+// event from page with info about engine (is exist, version...)
+document.addEventListener(ENGINE_MESSAGE_CHECK + "-page", (event) => {
+    document.dispatchEvent(new CustomEvent(ENGINE_MESSAGE_CHECK + "-content", { detail: { version : ENGINE_VERSION } }));
+});
+
+// event from page with action (proxy to background)
+document.addEventListener(ENGINE_MESSAGE_DATA + "-page", (event) => {
+    chrome.runtime.sendMessage({
+        id : ENGINE_MESSAGE_DATA + "-engine",
+        data : event.detail
+    });    
+});
+
+document.addEventListener(ENGINE_MESSAGE_DATA + "-engine", (event) => {
+    document.dispatchEvent(new CustomEvent(ENGINE_MESSAGE_DATA + "-content", event.detail));
+});

DesktopEditor/xmlsec/src/wasm/extension/extension/engine.js

@@ -0,0 +1,31 @@
+(function(window, undefined){
+
+    function Engine()
+	{
+	}
+
+	Engine.prototype.generateKeys = async function(alg, password, salt) 
+    {
+    };
+
+    Engine.prototype.changePassword = async function(privateKey, passwordOld, passwordNew, salt) 
+    {
+    };
+
+    Engine.prototype.sign = async function(privateKey, password, salt, xml) 
+    {
+    };
+
+    // ENCRYPT
+    Engine.prototype.decrypt = async function(privateKeyEnc, password, salt, data) 
+    {
+    };
+
+    Engine.prototype.encrypt = async function(publicKey, data) 
+    {
+    };
+
+	window.cryptoJS = new Engine();
+
+})(window, undefined);
+

DesktopEditor/xmlsec/src/wasm/extension/extension/engine.wasm.js

@@ -0,0 +1,223 @@
+(function(window, undefined){
+    WebAssembly.instantiateStreaming = undefined;
+
+    function MemoryData(ptr) {
+        this.ptr = ptr;
+    }
+    MemoryData.prototype.isValid = function() {
+        return (this.ptr === 0) ? false : true;
+    };
+    MemoryData.prototype.free = function() {
+        if (0 != this.ptr)
+            Module["_Crypto_Free"](this.ptr);
+    };
+    MemoryData.prototype.getData = function() {
+        let lenArray = new Int32Array(Module["HEAP8"].buffer, this.ptr, 4);
+        let len = lenArray[0];
+        return new Uint8Array(Module["HEAP8"].buffer, this.ptr + 4, len);
+    };
+
+    function StringPointer(pointer, len) {
+        this.ptr = pointer;
+        this.length = len;
+    }
+    StringPointer.prototype.free = function() {
+        if (0 !== this.ptr)
+            Module["_free"](this.ptr);
+    };
+
+    String.prototype.toUtf8Pointer = function(isNoEndNull) {
+        var tmp = this.toUtf8(isNoEndNull, true);
+        var pointer = Module["_malloc"](tmp.length);
+        if (0 == pointer)
+            return null;
+
+        Module["HEAP8"].set(tmp, pointer);
+        return new StringPointer(pointer,tmp.length);
+    };
+
+    function typedArrayToMemory(data)
+    {
+        var pointer = Module["_malloc"](data.length);
+		Module["HEAP8"].set(data, langBuffer);
+        return pointer;
+    }
+
+    function Engine()
+    {
+        this.isInit = false;
+        this.waitResolvers = [];
+    }
+
+    Engine.prototype.onLoad = function() 
+    {
+        this.isInit = true;
+
+        for (let i = 0, len = this.waitResolvers.length; i < len; i++)
+            this.waitResolvers[i]();
+
+        this.waitResolvers = [];
+    };
+
+    Engine.prototype.init = async function()
+    {
+        if (this.isInit)
+            return;
+
+        return new Promise(resolve => (function(){
+            window.CryptoJS.waitResolvers.push(resolve);
+		})());
+    };
+
+    // SIGN
+    Engine.prototype.generateKeys = async function(alg, password, salt) 
+    {
+        await this.init();
+
+        if (!salt)
+            salt = window.UtilsJS.toBase64(window.UtilsJS.random(32));
+
+        let algPtr = "ed25519".toUtf8Pointer();
+        let passwordPtr = password.toUtf8Pointer();
+        let saltPtr = salt.toUtf8Pointer();
+
+        let keys = Module["_Crypto_CreateKeys"](algPtr.ptr, passwordPtr.ptr, saltPtr.ptr);
+
+        algPtr.free();
+        passwordPtr.free();
+        saltPtr.free();
+
+        if (keys === 0)
+            return null;
+
+        let heap = Module["HEAP8"];
+
+        let currentStart = keys;
+        let currentEnd = currentStart;
+        while (heap[currentEnd] != 0)
+            currentEnd++;
+        let publicKey = "".fromUtf8(heap, currentStart, currentEnd - currentStart);
+
+        currentStart = currentEnd + 1;
+        currentEnd = currentStart;
+        while (heap[currentEnd] != 0)
+            currentEnd++;
+        let privateKey = "".fromUtf8(heap, currentStart, currentEnd - currentStart);
+
+        Module["_Crypto_Free"](keys);
+
+        return {
+            "salt": salt,
+            "privateKey": privateKey,
+            "publicKey": publicKey
+        };
+    };
+
+    Engine.prototype.changePassword = async function(privateKey, passwordOld, passwordNew, salt) 
+    {
+        await this.init();
+
+        let privateKeyPtr = privateKey.toUtf8Pointer();
+        let passwordOldPtr = passwordOld.toUtf8Pointer();
+        let passwordNewPtr = passwordNew.toUtf8Pointer();
+        let saltPtr = salt.toUtf8Pointer();
+
+        let privateKeyEnc = Module["_Crypto_ChangePassword"](privateKeyPtr.ptr, passwordOldPtr.ptr, passwordNewPtr.ptr, saltPtr.ptr);
+
+        privateKeyPtr.free();
+        passwordOldPtr.free();
+        passwordNewPtr.free();
+        saltPtr.free();
+
+        if (privateKeyEnc === 0)
+            return null;
+
+        let heap = Module["HEAP8"];
+
+        let currentStart = privateKeyEnc;
+        let currentEnd = currentStart;
+        while (heap[currentEnd] != 0)
+            currentEnd++;
+
+        let privateKeyString = "".fromUtf8(heap, currentStart, currentEnd - currentStart);
+
+        Module["_Crypto_Free"](privateKeyEnc);
+        return privateKeyString;
+    };
+
+    Engine.prototype.sign = async function(privateKey, password, salt, xml) 
+    {
+        await this.init();
+
+        let privateKeyPtr = privateKey.toUtf8Pointer();
+        let passwordPtr = password.toUtf8Pointer();
+        let saltPtr = salt.toUtf8Pointer();
+        let xmlPtr = xml.toUtf8Pointer();
+
+        let signData = Module["_Crypto_Sign"](privateKeyPtr.ptr, passwordPtr.ptr, saltPtr.ptr, xmlPtr.ptr, xmlPtr.length);
+
+        privateKeyPtr.free();
+        passwordPtr.free();
+        saltPtr.free();
+        xmlPtr.free();
+
+        if (signData === 0)
+            return null;
+
+        let heap = Module["HEAP8"];
+
+        let currentStart = signData;
+        let currentEnd = currentStart;
+        while (heap[currentEnd] != 0)
+            currentEnd++;
+
+        let signString = "".fromUtf8(heap, currentStart, currentEnd - currentStart);
+
+        Module["_Crypto_Free"](signData);
+        return signString;
+    };
+
+    // ENCRYPT
+    Engine.prototype.decrypt = async function(privateKeyEnc, password, salt, data) 
+    {
+        await this.init();
+
+        let privateKeyEncPtr = privateKeyEnc.toUtf8Pointer();
+        let passwordPtr = password.toUtf8Pointer();
+        let saltPtr = salt.toUtf8Pointer();
+
+        let dataPtr = typedArrayToMemory(data);
+
+        let decryptData = Module["_Crypto_Decrypt"](privateKeyEncPtr, passwordPtr, saltPtr.ptr, dataPtr, data.length);
+        let memoryData = new CMemoryData(decryptData);
+
+        privateKeyEncPtr.free();
+        passwordPtr.free();
+        saltPtr.free();
+        
+        Module["_free"](dataPtr);
+
+        return memoryData;
+    };
+
+    Engine.prototype.encrypt = async function(publicKey, data) 
+    {
+        await this.init();
+
+        let publicKeyEncPtr = publicKey.toUtf8Pointer();
+        let dataPtr = typedArrayToMemory(data);
+
+        let encryptData = Module["_Crypto_Encrypt"](publicKeyEncPtr, dataPtr, data.length);
+        let memoryData = new CMemoryData(decryptData);
+
+        publicKeyEncPtr.free();
+        Module["_free"](dataPtr);
+
+        return memoryData;
+    };
+
+    window.cryptoJS = new Engine();
+
+    //module
+
+});

DesktopEditor/xmlsec/src/wasm/extension/extension/manifest.json

@@ -0,0 +1,43 @@
+{
+    "manifest_version": 3,
+    "name": "ONLYOFFICE Keychain",
+    "version": "1.0",
+    "permissions": ["tabs", "scripting"],
+    "icons": {
+        "16": "icons/icon16.png",
+        "32": "icons/icon32.png",
+        "48": "icons/icon48.png",
+        "64": "icons/icon64.png",
+        "128": "icons/icon128.png"
+    },
+    "background": {
+        "service_worker": "background.js"
+    },
+    "host_permissions": ["<all_urls>"],
+    "action": {
+        "default_icon": {
+            "16": "icons/icon16.png",
+            "32": "icons/icon32.png",
+            "48": "icons/icon48.png",
+            "64": "icons/icon64.png",
+            "128": "icons/icon128.png"
+        },
+        "default_popup": "popup.html"
+    },
+    "content_scripts": [
+        {
+            "matches": ["<all_urls>"],
+            "js": ["content.js"]
+        }
+    ],
+    "web_accessible_resources": [
+        {
+            "resources": ["engine.wasm"],
+            "matches": ["<all_urls>"]
+        }
+    ],
+    "content_security_policy": {
+        "extension_pages" : "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'"
+    }
+}
+  

DesktopEditor/xmlsec/src/wasm/extension/extension/popup.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Popup</title>
+</head>
+<body>
+    <h2>Сообщение получено!</h2>
+    <div id="message"></div>
+    <button id="testButton">buttton</button>
+    <script src="popup.js"></script>
+</body>
+</html>

DesktopEditor/xmlsec/src/wasm/extension/extension/popup.js

@@ -0,0 +1,17 @@
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+    document.getElementById("message").innerText = JSON.stringify(message);
+});
+
+document.addEventListener("DOMContentLoaded", (event) => {
+    
+    document.getElementById("testButton").onclick = function(e) {
+        chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
+            if (tabs.length === 0) return;
+            
+            chrome.tabs.sendMessage(tabs[0].id, { action: "popupMessage", text: "Привет от Popup!" }, (response) => {
+                console.log("Ответ от контентного скрипта:", response);
+            });
+        });
+    };
+
+});

DesktopEditor/xmlsec/src/wasm/extension/extension/update_background.py

@@ -0,0 +1,22 @@
+import sys
+sys.path.append("../../../../../../../build_tools/scripts")
+import base
+import argparse
+
+parser = argparse.ArgumentParser(description='Generate background script for debug')
+
+parser.add_argument("--wasm", action="store_true")
+args = parser.parse_args()
+
+content = base.readFile("./utils.js") + "\n\n"
+
+if args.wasm:
+    content = content + "\n\n" + base.readFile("./../deploy/engine.js")
+    base.copy_file("./../deploy/engine.wasm", "./engine.wasm")
+else:
+    content = content + "\n\n" + base.readFile("./engine.js")
+
+content = content + "\n\n" + base.readFile("./background_base.js")
+
+base.delete_file("./background.js")
+base.writeFile("./background.js", content)

DesktopEditor/xmlsec/src/wasm/extension/extension/utils.js

@@ -0,0 +1,334 @@
+(function(window, undefined) {
+    if (undefined !== String.prototype.fromUtf8 && undefined !== String.prototype.toUtf8)
+        return;
+
+    var STRING_UTF8_BUFFER_LENGTH = 1024;
+    var STRING_UTF8_BUFFER = new ArrayBuffer(STRING_UTF8_BUFFER_LENGTH);
+
+    /**
+     * Read string from utf8
+     * @param {Uint8Array} buffer
+     * @param {number} [start=0]
+     * @param {number} [len]
+     * @returns {string}
+     */
+    String.prototype.fromUtf8 = function(buffer, start, len) {
+        if (undefined === start)
+            start = 0;
+        if (undefined === len)
+            len = buffer.length - start;
+
+        var result = "";
+        var index = start;
+        var end = start + len;
+        while (index < end) {
+            var u0 = buffer[index++];
+            if (!(u0 & 128)) {
+                result += String.fromCharCode(u0);
+                continue;
+            }
+            var u1 = buffer[index++] & 63;
+            if ((u0 & 224) == 192) {
+                result += String.fromCharCode((u0 & 31) << 6 | u1);
+                continue;
+            }
+            var u2 = buffer[index++] & 63;
+            if ((u0 & 240) == 224)
+                u0 = (u0 & 15) << 12 | u1 << 6 | u2;
+            else
+                u0 = (u0 & 7) << 18 | u1 << 12 | u2 << 6 | buffer[index++] & 63;
+            if (u0 < 65536)
+                result += String.fromCharCode(u0);
+            else {
+                var ch = u0 - 65536;
+                result += String.fromCharCode(55296 | ch >> 10, 56320 | ch & 1023);
+            }
+        }
+        return result;
+    };
+
+    /**
+     * Convert string to utf8 array
+     * @returns {Uint8Array}
+     */
+    String.prototype.toUtf8 = function(isNoEndNull, isUseBuffer) {
+        var inputLen = this.length;
+        var testLen = 6 * inputLen + 1;
+        var tmpStrings = (isUseBuffer && testLen < STRING_UTF8_BUFFER_LENGTH) ? STRING_UTF8_BUFFER : new ArrayBuffer(testLen);
+
+        var code = 0;
+        var index = 0;
+
+        var outputIndex = 0;
+        var outputDataTmp = new Uint8Array(tmpStrings);
+        var outputData = outputDataTmp;
+
+        while (index < inputLen) {
+            code = this.charCodeAt(index++);
+            if (code >= 0xD800 && code <= 0xDFFF && index < inputLen)
+                code = 0x10000 + (((code & 0x3FF) << 10) | (0x03FF & this.charCodeAt(index++)));
+
+            if (code < 0x80)
+                outputData[outputIndex++] = code;
+            else if (code < 0x0800) {
+                outputData[outputIndex++] = 0xC0 | (code >> 6);
+                outputData[outputIndex++] = 0x80 | (code & 0x3F);
+            } else if (code < 0x10000) {
+                outputData[outputIndex++] = 0xE0 | (code >> 12);
+                outputData[outputIndex++] = 0x80 | ((code >> 6) & 0x3F);
+                outputData[outputIndex++] = 0x80 | (code & 0x3F);
+            } else if (code < 0x1FFFFF) {
+                outputData[outputIndex++] = 0xF0 | (code >> 18);
+                outputData[outputIndex++] = 0x80 | ((code >> 12) & 0x3F);
+                outputData[outputIndex++] = 0x80 | ((code >> 6) & 0x3F);
+                outputData[outputIndex++] = 0x80 | (code & 0x3F);
+            } else if (code < 0x3FFFFFF) {
+                outputData[outputIndex++] = 0xF8 | (code >> 24);
+                outputData[outputIndex++] = 0x80 | ((code >> 18) & 0x3F);
+                outputData[outputIndex++] = 0x80 | ((code >> 12) & 0x3F);
+                outputData[outputIndex++] = 0x80 | ((code >> 6) & 0x3F);
+                outputData[outputIndex++] = 0x80 | (code & 0x3F);
+            } else if (code < 0x7FFFFFFF) {
+                outputData[outputIndex++] = 0xFC | (code >> 30);
+                outputData[outputIndex++] = 0x80 | ((code >> 24) & 0x3F);
+                outputData[outputIndex++] = 0x80 | ((code >> 18) & 0x3F);
+                outputData[outputIndex++] = 0x80 | ((code >> 12) & 0x3F);
+                outputData[outputIndex++] = 0x80 | ((code >> 6) & 0x3F);
+                outputData[outputIndex++] = 0x80 | (code & 0x3F);
+            }
+        }
+
+        if (isNoEndNull !== true)
+            outputData[outputIndex++] = 0;
+
+        return new Uint8Array(tmpStrings,0,outputIndex);
+    };
+
+    window.UtilsJS = {};
+
+    var charA = "A".charCodeAt(0);
+    var charZ = "Z".charCodeAt(0);
+    var chara = "a".charCodeAt(0);
+    var charz = "z".charCodeAt(0);
+    var char0 = "0".charCodeAt(0);
+    var char9 = "9".charCodeAt(0);
+    var charp = "+".charCodeAt(0);
+    var chars = "/".charCodeAt(0);
+    var char_break = ";".charCodeAt(0);
+
+    function decodeBase64Char(ch)
+    {
+        if (ch >= charA && ch <= charZ)
+            return ch - charA + 0;
+        if (ch >= chara && ch <= charz)
+            return ch - chara + 26;
+        if (ch >= char0 && ch <= char9)
+            return ch - char0 + 52;
+        if (ch == charp)
+            return 62;
+        if (ch == chars)
+            return 63;
+        return -1;
+    }
+
+    var stringBase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    var arrayBase64  = [];
+    for (var index64 = 0; index64 < stringBase64.length; index64++)
+    {
+        arrayBase64.push(stringBase64.charAt(index64));
+    }
+
+    window.UtilsJS.Base64 = {};
+
+    window.UtilsJS.Base64.decodeData = function(input, input_offset, input_len, output, output_offset)
+    {
+        var isBase64 = typeof input === "string";
+        if (undefined === input_len) input_len = input.length;
+        var writeIndex = (undefined === output_offset) ? 0 : output_offset;
+        var index = (undefined === input_offset) ? 0 : input_offset;
+
+        while (index < input_len)
+        {
+            var dwCurr = 0;
+            var i;
+            var nBits = 0;
+            for (i=0; i<4; i++)
+            {
+                if (index >= input_len)
+                    break;
+                var nCh = decodeBase64Char(isBase64 ? input.charCodeAt(index) : input[index]);
+                index++;
+                if (nCh == -1)
+                {
+                    i--;
+                    continue;
+                }
+                dwCurr <<= 6;
+                dwCurr |= nCh;
+                nBits += 6;
+            }
+
+            dwCurr <<= 24-nBits;
+            for (i=0; i<(nBits>>3); i++)
+            {
+                output[writeIndex++] = ((dwCurr & 0x00ff0000) >>> 16);
+                dwCurr <<= 8;
+            }
+        }
+        return writeIndex;
+    };
+
+    window.UtilsJS.Base64.decode = function(input, isUsePrefix, dstlen, offset)
+    {
+        var srcLen = input.length;
+        var index = (undefined === offset) ? 0 : offset;
+        var dstLen = (undefined === dstlen) ? srcLen : dstlen;
+
+        var isBase64 = typeof input === "string";
+
+        if (isUsePrefix && isBase64)
+        {
+            dstLen = 0;
+            var maxLen = Math.max(11, srcLen); // > 4 Gb
+            while (index < maxLen)
+            {
+                var c = input.charCodeAt(index++);
+                if (c == char_break)
+                    break;
+
+                dstLen *= 10;
+                dstLen += (c - char0);
+            }
+
+            if (index == maxLen)
+            {
+                index = 0;
+                dstLen = srcLen;
+            }
+        }
+
+        var dst = new Uint8Array(dstLen);
+        var writeIndex = window.AscCommon.Base64.decodeData(input, index, srcLen, dst, 0);
+
+        if (writeIndex == dstLen)
+            return dst;
+
+        return new Uint8Array(dst.buffer, 0, writeIndex);
+    };
+
+    window.UtilsJS.Base64.encode = function(input, offset, length, isUsePrefix)
+    {
+        var srcLen = (undefined === length) ? input.length : length;
+        var index = (undefined === offset) ? 0 : offset;
+
+        var len1 = (((srcLen / 3) >> 0) * 4);
+        var len2 = (len1 / 76) >> 0;
+        var len3 = 19;
+        var dstArray = [];
+
+        var sTemp = "";
+        var dwCurr = 0;
+        for (var i = 0; i <= len2; i++)
+        {
+            if (i == len2)
+                len3 = ((len1 % 76) / 4) >> 0;
+
+            for (var j = 0; j < len3; j++)
+            {
+                dwCurr = 0;
+                for (var n = 0; n < 3; n++)
+                {
+                    dwCurr |= input[index++];
+                    dwCurr <<= 8;
+                }
+
+                sTemp = "";
+                for (var k = 0; k < 4; k++)
+                {
+                    var b = (dwCurr >>> 26) & 0xFF;
+                    sTemp += arrayBase64[b];
+                    dwCurr <<= 6;
+                    dwCurr &= 0xFFFFFFFF;
+                }
+                dstArray.push(sTemp);
+            }
+        }
+        len2 = (srcLen % 3 != 0) ? (srcLen % 3 + 1) : 0;
+        if (len2)
+        {
+            dwCurr = 0;
+            for (var n = 0; n < 3; n++)
+            {
+                if (n < (srcLen % 3))
+                    dwCurr |= input[index++];
+                dwCurr <<= 8;
+            }
+
+            sTemp = "";
+            for (var k = 0; k < len2; k++)
+            {
+                var b = (dwCurr >>> 26) & 0xFF;
+                sTemp += arrayBase64[b];
+                dwCurr <<= 6;
+            }
+
+            len3 = (len2 != 0) ? 4 - len2 : 0;
+            for (var j = 0; j < len3; j++)
+            {
+                sTemp += '=';
+            }
+            dstArray.push(sTemp);
+        }
+
+        return isUsePrefix ? (("" + srcLen + ";") + dstArray.join("")) : dstArray.join("");
+    };
+
+    window.UtilsJS.Hex = {};
+
+    window.UtilsJS.Hex.decode = function(input)
+    {
+        var hexToByte = function(c) {
+            if (c >= 48 && c <= 57) return c - 48; // 0..9
+            if (c >= 97 && c <= 102) return c - 87;
+            if (c >= 65 && c <= 70) return c - 55;
+            return 0;
+        };
+
+        var len = input.length;
+        if (len & 0x01) len -= 1;
+        var result = new Uint8Array(len >> 1);
+        var resIndex = 0;
+        for (var i = 0; i < len; i += 2)
+        {
+            result[resIndex++] = hexToByte(input.charCodeAt(i)) << 4 | hexToByte(input.charCodeAt(i + 1));
+        }
+        return result;
+    };
+
+    window.UtilsJS.Hex.encode = function(input, isUpperCase)
+    {
+        var byteToHex = new Array(256);
+        for (var i = 0; i < 16; i++)
+            byteToHex[i] = "0" + (isUpperCase ? i.toString(16).toUpperCase() : i.toString(16));
+        for (var i = 16; i < 256; i++)
+            byteToHex[i] = isUpperCase ? i.toString(16).toUpperCase() : i.toString(16);
+
+        var result = "";
+        for (var i = 0, len = input.length; i < len; i++)
+            result += byteToHex[input[i]];
+
+        return result;
+    };    
+
+    window.UtilsJS.random = function(length) {
+        let byteArray = new Uint8Array(length);
+        let engine = window.crypto || window.msCrypto;
+        if (engine)
+            engine.getRandomValues(byteArray);
+        else {
+            for (let i = 0; i < length; i++)
+                byteArray[i] = (Math.random() * 256) >> 0;
+        }
+        return byteArray;
+    };
+})(self);

DesktopEditor/xmlsec/src/wasm/extension/extension2/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

DesktopEditor/xmlsec/src/wasm/extension/extension2/README.md

@@ -0,0 +1,6 @@
+# Onlyoffice keychain extension
+
+To run the dev build:
+1. Go to the extension2 folder
+2. Run ```npm run dev```
+3. Upload the dist folder as an unpacked extension to the browser

DesktopEditor/xmlsec/src/wasm/extension/extension2/eslint.config.js

@@ -0,0 +1,26 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import tseslint from 'typescript-eslint'
+import { globalIgnores } from 'eslint/config'
+
+export default tseslint.config([
+  globalIgnores(['dist']),
+  {
+    files: ['**/*.{ts,tsx}'],
+    extends: [
+      js.configs.recommended,
+      tseslint.configs.recommended,
+      reactHooks.configs['recommended-latest'],
+      reactRefresh.configs.vite,
+    ],
+    languageOptions: {
+      ecmaVersion: 2020,
+      globals: globals.browser,
+    },
+	  rules: {
+		  '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+	  }
+  },
+])

DesktopEditor/xmlsec/src/wasm/extension/extension2/manifest.config.ts

@@ -0,0 +1,34 @@
+import { defineManifest } from '@crxjs/vite-plugin';
+import pkg from "./package.json";
+
+export default defineManifest({
+    manifest_version: 3,
+    name: pkg.name,
+    version: pkg.version,
+    icons: {
+        16: "public/icons/icon16.png",
+        32: "public/icons/icon32.png",
+        48: "public/icons/icon48.png",
+        64: "public/icons/icon64.png",
+        128: "public/icons/icon128.png",
+    },
+    action: {
+        default_icon: {
+            16: "public/icons/icon16.png",
+            32: "public/icons/icon32.png",
+            48: "public/icons/icon48.png",
+            64: "public/icons/icon64.png",
+            128: "public/icons/icon128.png",
+        },
+        default_popup: 'src/popup/index.html',
+    },
+    content_scripts: [{
+        js: ['src/content/content.ts'],
+        matches: ['<all_urls>'],
+        run_at: "document_end"
+    }],
+    background: {
+        service_worker: "src/background/background.ts"
+    },
+    permissions: ["storage"],
+});

DesktopEditor/xmlsec/src/wasm/extension/extension2/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "ONLYOFFICE Keychain",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "scripts": {
+	"dev": "vite",
+	"build": "tsc && vite build",
+    "lint": "eslint .",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
+    "webextension-polyfill": "^0.12.0"
+  },
+  "devDependencies": {
+    "@crxjs/vite-plugin": "^2.2.0",
+    "@eslint/js": "^9.33.0",
+    "@types/react": "^19.1.10",
+    "@types/react-dom": "^19.1.7",
+    "@types/webextension-polyfill": "^0.12.3",
+    "@vitejs/plugin-react": "^5.0.0",
+    "chrome-types": "^0.1.375",
+    "eslint": "^9.33.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-refresh": "^0.4.20",
+    "globals": "^16.3.0",
+    "typescript": "~5.8.3",
+    "typescript-eslint": "^8.39.1",
+    "vite": "^7.1.5"
+  }
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/background/background.ts

@@ -0,0 +1,5 @@
+import {initCheckOpenedPopup} from "./utils.ts";
+import initTaskManager from "./task-manager/task-manager.ts";
+
+initTaskManager();
+initCheckOpenedPopup();

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/background/task-manager/task-manager.ts

@@ -0,0 +1,31 @@
+import browser from "webextension-polyfill";
+import {messageTypes} from "../../common/message-const.ts";
+import {generatePopupKeys, selectSignKeys, signData, verifyData} from "./tasks.ts";
+import {isBackgroundMessageType} from "../../common/message-types.ts";
+
+const initTaskManager = () => {
+    browser.runtime.onMessage.addListener((message: unknown) => {
+        if (!isBackgroundMessageType(message)) {
+            return false;
+        }
+        const data = message.data;
+        switch (data.type) {
+            case messageTypes.GENERATE_KEYS: {
+                return generatePopupKeys();
+            }
+            case messageTypes.SELECT_SIGN_KEYS: {
+                return selectSignKeys();
+            }
+            case messageTypes.SIGN_DATA: {
+                return signData(data.base64Data, data.guid);
+            }
+            case messageTypes.VERIFY_DATA: {
+                return verifyData(data.base64Data, data.base64Signature, data.guid);
+            }
+            default:
+                return false;
+        }
+    });
+}
+
+export default initTaskManager;

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/background/task-manager/tasks.ts

@@ -0,0 +1,43 @@
+import {openPopup} from "../utils.ts";
+import {messageTypes} from "../../common/message-const.ts";
+import {sendToPopup} from "../../content/messenger.ts";
+// @ts-ignore
+import {StorageManager} from "../../common/storage.ts";
+import {ab2base64, base642ui} from "../../common/utils.ts";
+import getCrypto from "../../common/crypto.ts";
+
+export const generatePopupKeys = async () => {
+    await openPopup();
+    await sendToPopup({type: messageTypes.WAIT_ENTER_PASSWORD});
+    return true;
+}
+
+export const selectSignKeys = async () => {
+    await openPopup();
+    await sendToPopup({type: messageTypes.WAIT_ENTER_PASSWORD});
+    return await sendToPopup({type: messageTypes.SELECT_SIGN_KEYS});
+};
+
+export const signData = async (base64Data: string , guid: string) => {
+    const keyStorage = new StorageManager();
+    await keyStorage.loadKeysFromStorage();
+    const keyPair = keyStorage.getKeyByGuid(guid);
+    if (!keyPair) {
+        throw new Error("Key pair is not found");
+    }
+    const data = base642ui(base64Data);
+    const signData = await keyPair.sign(data);
+    return ab2base64(signData);
+}
+
+export const verifyData = async (base64Data: string, base64Signature: string, guid: string) => {
+    const keyStorage = new StorageManager();
+    await keyStorage.loadKeysFromStorage();
+    const keyPair = keyStorage.getKeyByGuid(guid);
+    if (!keyPair) {
+        throw new Error("Key pair is not found");
+    }
+    const data = base642ui(base64Data);
+    const signature = base642ui(base64Signature);
+    return await keyPair.verify(signature, data);
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/background/utils.ts

@@ -0,0 +1,52 @@
+import browser from "webextension-polyfill";
+import getCrypto from "../common/crypto.ts";
+
+export const initCheckOpenedPopup = () => {
+    browser.runtime.onConnect.addListener((port) => {
+        if (port.name === "popup") {
+            browser.storage.session.set({isOpenPopup: true});
+
+            port.onDisconnect.addListener(() => {
+                browser.storage.session.set({isOpenPopup: false});
+            });
+        }
+    });
+};
+
+const isOpenedPopup = async () => {
+    const isOpenPopupItem = await browser.storage.session.get("isOpenPopup");
+    return !!(isOpenPopupItem && isOpenPopupItem.isOpenPopup);
+};
+
+const waitClosingPopup = async () => {
+    const isOpenPopup = await isOpenedPopup();
+    if (!isOpenPopup) {
+        return true;
+    }
+    return new Promise(resolve => {
+        browser.storage.session.onChanged.addListener(function handler(change) {
+            if (change.isOpenPopup && !change.isOpenPopup.newValue) {
+                browser.storage.session.onChanged.removeListener(handler);
+                resolve(true);
+            }
+        });
+    });
+};
+
+export const openPopup = async () => {
+    await waitClosingPopup();
+    await browser.action.openPopup();
+    return new Promise(resolve => {
+        browser.storage.session.onChanged.addListener(function handler(change) {
+            if (change.isOpenPopup && change.isOpenPopup.newValue) {
+                browser.storage.session.onChanged.removeListener(handler);
+                resolve(true);
+            }
+        });
+    });
+};
+type TGuid = `{${string}-${string}-${string}-${string}-${string}}`
+export const getGUID = (): TGuid => {
+    const crypto = getCrypto();
+    return `{${crypto.randomUUID()}}`;
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/crypto.ts

@@ -0,0 +1,138 @@
+import {Key, KeyPair, KeyUsages, PrivateKey, PublicKey, SymmetricKey} from "./keys/keys.ts";
+import {
+    type DigestType,
+    digestTypes,
+    type ExportKeyFormat,
+    exportKeyFormats,
+    type KeyGenParams,
+    type KeyParams
+} from "./keys/key-types.ts";
+import {AesGcmGenParams, type AesGcmParams} from "./keys/params.ts";
+
+const pbkdf2Parameters = {
+  iterations: 150000,
+  hash: digestTypes.SHA256,
+    saltLength: 16
+};
+// type DecryptKey = PrivateKey | SymmetricKey;
+// type EncryptKey = PublicKey | SymmetricKey;
+abstract class CCryptoBase {
+    abstract sign(key: PrivateKey, data: ArrayBuffer): Promise<ArrayBuffer>;
+    abstract digest(algorithm: DigestType, data: ArrayBuffer): Promise<ArrayBuffer>;
+    abstract verify(key: PublicKey, signature: ArrayBuffer, data: ArrayBuffer): Promise<boolean>;
+    // abstract decrypt(key: DecryptKey, data: ArrayBuffer): Promise<ArrayBuffer>;
+    // abstract encrypt(key: EncryptKey, data: ArrayBuffer): Promise<ArrayBuffer>;
+    abstract generateKey(params: KeyGenParams, keyUsage: KeyUsages): Promise<SymmetricKey | KeyPair>;
+    abstract wrapKey(format: ExportKeyFormat, key: Key, masterPassword: ArrayBuffer, salt: ArrayBuffer, aesParams: AesGcmParams, keyUsage: KeyUsages): Promise<ArrayBuffer>
+    abstract unwrapKey(format: ExportKeyFormat, key: ArrayBuffer, masterPassword: ArrayBuffer, salt: ArrayBuffer, aesParams: AesGcmParams, keyParams: KeyParams, keyUsage: KeyUsages): Promise<ArrayBuffer>
+    abstract getRandomValues(length: number): ArrayBuffer;
+    abstract randomUUID(): string;
+    }
+    class CWebCrypto extends CCryptoBase {
+        crypto = globalThis.crypto;
+        subtle = this.crypto.subtle;
+        constructor() {
+            super();
+        }
+        getRandomValues(length: number) {
+            const ui = new Uint8Array(length);
+            return this.crypto.getRandomValues(ui);
+        }
+        async getAesCryptoKey(masterPassword: ArrayBuffer, salt: ArrayBuffer) {
+            const pwKey = await this.subtle.importKey(
+                'raw',
+                masterPassword,
+                { name: 'PBKDF2' },
+                false,
+                ['deriveKey']
+            );
+            return this.subtle.deriveKey(
+                {
+                    name: 'PBKDF2',
+                    salt: salt,
+                    iterations: pbkdf2Parameters.iterations,
+                    hash: pbkdf2Parameters.hash
+                },
+                pwKey,
+                new AesGcmGenParams(),
+                false,
+                ['wrapKey', 'unwrapKey']
+            );
+        };
+        async wrapKey(format: ExportKeyFormat, key: Key, masterPassword: ArrayBuffer, salt: ArrayBuffer, aesParams: AesGcmParams, keyUsage: KeyUsages) {
+            const cryptoAesKey = await this.getAesCryptoKey(masterPassword, salt);
+            const importKey = await this.getCryptoKeyFromWrapper(key, keyUsage);
+            return this.subtle.wrapKey(format, importKey, cryptoAesKey, aesParams);
+        }
+        async unwrapKey(format: ExportKeyFormat, key: ArrayBuffer, masterPassword: ArrayBuffer, salt: ArrayBuffer, aesParams: AesGcmParams, keyParams: KeyParams, keyUsages: KeyUsages) {
+            const cryptoAesKey = await this.getAesCryptoKey(masterPassword, salt);
+            const cryptoKey = await this.subtle.unwrapKey(format, key, cryptoAesKey, aesParams, keyParams, true, /*this.getKeyUsages(keyUsages)*/["sign"]);
+            return this.subtle.exportKey(format, cryptoKey);
+        }
+        async getCryptoKeyFromWrapper(key: Key, keyUsage: KeyUsages) {
+            return this.subtle.importKey(key.exportFormat, key.key, key.params, true, this.getKeyUsages(keyUsage, key));
+        }
+        getKeyUsages({isEncrypt, isSign}: KeyUsages, key?: Key) {
+            const keyUsages: KeyUsage[] = [];
+            if (isEncrypt) {
+                if (key instanceof PrivateKey) {
+                    keyUsages.push("decrypt");
+                } else if (key instanceof PublicKey) {
+                    keyUsages.push("encrypt");
+                } else {
+                    keyUsages.push("encrypt", "decrypt");
+                }
+            }
+            if (isSign) {
+                if (key instanceof PrivateKey) {
+                    keyUsages.push("sign");
+                } else if (key instanceof PublicKey) {
+                    keyUsages.push("verify");
+                } else {
+                    keyUsages.push("sign", "verify");
+                }
+            }
+            return keyUsages;
+        }
+        async sign(key: PrivateKey, data: ArrayBuffer): Promise<ArrayBuffer> {
+            const cryptoKey = await this.getCryptoKeyFromWrapper(key, new KeyUsages(false, true));
+            return this.subtle.sign(key.params, cryptoKey, data);
+        }
+        async digest(algorithm: DigestType, data: ArrayBuffer): Promise<ArrayBuffer> {
+            return this.subtle.digest(algorithm, data);
+        }
+        async verify(key: PublicKey, signature: ArrayBuffer, data: ArrayBuffer): Promise<boolean> {
+            const cryptoKey = await this.getCryptoKeyFromWrapper(key, new KeyUsages(false, true));
+            return this.subtle.verify(key.params, cryptoKey, signature, data);
+        }
+        // async decrypt(key: DecryptKey, data: ArrayBuffer): Promise<ArrayBuffer> {
+        //     const cryptoKey = await this.getCryptoKeyFromWrapper(key);
+        //     return this.subtle.decrypt(cryptoKey);
+        // }
+        // async encrypt(key: EncryptKey, data: ArrayBuffer): Promise<ArrayBuffer> {
+        //     throw new Error("Method not implemented.");
+        // }
+        async generateKey(params: KeyGenParams, keyUsage: KeyUsages) {
+            const cryptoKey = await this.subtle.generateKey(params, true, this.getKeyUsages(keyUsage));
+            const importParams = params.getImportParams();
+            if (("privateKey" in cryptoKey) && ("publicKey" in cryptoKey)) {
+                const publicKeyBuffer = await this.subtle.exportKey(exportKeyFormats.spki, cryptoKey.publicKey);
+                const publicKey = new PublicKey(publicKeyBuffer, importParams);
+                const privateKeyBuffer = await this.subtle.exportKey(exportKeyFormats.pkcs8, cryptoKey.privateKey);
+                const privateKey = new PrivateKey(privateKeyBuffer, importParams, this.getRandomValues(pbkdf2Parameters.saltLength));
+                return new KeyPair(publicKey, privateKey, keyUsage);
+            }
+            const keyBuffer = await this.subtle.exportKey(exportKeyFormats.raw, cryptoKey);
+            return new SymmetricKey(keyBuffer, importParams, keyUsage);
+        };
+
+        randomUUID() {
+            return this.crypto.randomUUID();
+        }
+    }
+
+    const getCrypto = () => {
+    return new CWebCrypto();
+}
+
+export default getCrypto;

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/key-storage.ts

@@ -0,0 +1,73 @@
+import {KeyStorage} from "key-storage";
+import {downloadBinary, selectBinary} from "./utils.ts";
+
+export function StorageManager() {
+    this.keyStorage = new KeyStorage();
+}
+StorageManager.prototype.getBinaryKeys = function () {
+    return Promise.resolve(null);
+};
+StorageManager.prototype.loadKeysFromStorage = function() {
+    const oThis = this;
+    return Promise.all([this.getMasterPassword(), this.getBinaryKeys()]).then(function ([masterPassword, binaryData]) {
+        return oThis.keyStorage.import(binaryData, masterPassword);
+    });
+}
+StorageManager.prototype.changeMasterPassword = function(newMasterPassword) {
+    const oThis = this;
+    return this.getMasterPassword().then(function (oldMasterPassword) {
+        return oThis.keyStorage.changeMasterPassword(oldMasterPassword, newMasterPassword);
+    });
+};
+StorageManager.prototype.getMasterPassword = function() {
+    return Promise.resolve(null);
+};
+StorageManager.prototype.writeKeys = function() {
+    const oThis = this;
+    return this.keyStorage.export().then(function (exportedKeys) {
+        return oThis.setStorageKeys(exportedKeys);
+    });
+}
+StorageManager.prototype.setStorageKeys = function (exportedKeys) {
+    return Promise.resolve();
+};
+StorageManager.prototype.addNewKeys = function (keys) {
+    this.keyStorage.addKeys(keys);
+    return this.writeKeys();
+};
+StorageManager.prototype.deprecateKey = function (key) {
+    key.setIsValid(false);
+    return this.writeKeys();
+};
+
+StorageManager.prototype.exportKeys = function () {
+    return this.keyStorage.export().then(downloadBinary);
+};
+
+StorageManager.prototype.importKeys = function (callback) {
+    const oThis = this;
+    return this.getMasterPassword().then(function (masterPassword) {
+        selectBinary(function (file) {
+            try {
+                file.arrayBuffer().then(function (binaryData) {
+                    return oThis.keyStorage.import(binaryData, masterPassword);
+                }).then(function (keyObjects) {
+                    return oThis.addNewKeys(keyObjects);
+                }).then(function () {
+                    callback();
+                });
+            } catch (e) {
+            }
+        });
+    })
+};
+
+StorageManager.prototype.generateKeys = function (params) {
+    return this.keyStorage.generateKey(params);
+};
+StorageManager.prototype.getValidKeys = function () {
+    return this.keyStorage.getValidKeys();
+};
+StorageManager.prototype.getKeyByGuid = function (guid) {
+    return this.keyStorage.getKeyByGuid(guid);
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/keys/key-types.ts

@@ -0,0 +1,108 @@
+import {
+    AesGcmParams,
+    AesImportParams,
+    AesKeyGenParams, Ed25519ImportParams,
+    Ed25519KeyGenParams,
+    type RsaImportParams,
+    RSAKeyGenParams
+} from "./params.ts";
+import {Key, KeyPair, PrivateKey, PublicKey} from "./keys.ts";
+export const exportKeyFormats = {
+    pkcs8: "pkcs8",
+    spki: "spki",
+    raw: "raw"
+} as const;
+
+export const algorithmTypes = {
+    AES_GCM: "AES-GCM",
+    AES_CTR: "AES-CTR",
+    AES_CBC: "AES-CBC",
+    AES_KW: "AES-KW",
+    ED25519: "Ed25519",
+    RSASSA_PKCS1_v1_5: "RSASSA-PKCS1-v1_5",
+    RSA_PSS: "RSA-PSS",
+    RSA_OAEP: "RSA-OAEP"
+} as const;
+
+export const rsaTypes = {
+    RSASSA_PKCS1_v1_5: algorithmTypes.RSASSA_PKCS1_v1_5,
+    RSA_PSS: algorithmTypes.RSA_PSS,
+    RSA_OAEP: algorithmTypes.RSA_OAEP,
+} as const;
+
+export const aesTypes = {
+    AES_GCM: algorithmTypes.AES_GCM,
+    AES_CTR: algorithmTypes.AES_CTR,
+    AES_CBC: algorithmTypes.AES_CBC,
+    AES_KW: algorithmTypes.AES_KW,
+} as const;
+
+export const digestTypes = {
+    SHA1: "SHA-1",
+    SHA256: "SHA-256",
+    SHA384: "SHA-384",
+    SHA512: "SHA-512",
+} as const;
+
+export const keyTypes = {
+    symmetric: "symmetric",
+    pair: "pair"
+} as const;
+
+export const pairKeyTypes = {
+    private: "private",
+    public: "public",
+} as const;
+
+export const signAlgorithms = {
+    ED25519: algorithmTypes.ED25519
+}
+
+export const cryptAlgorithms = {
+    ...aesTypes,
+    RSA_OAEP: algorithmTypes.RSA_OAEP
+}
+
+export const isRSAJson = (obj: JSONKeyParams): obj is RsaJSONType => {
+    const name = obj.name;
+    return Object.values(rsaTypes).includes(name as RsaType);
+}
+export const isEd25519Json = (obj: JSONKeyParams): obj is Ed25519JSONParams => {
+    const name = obj.name;
+    return name === algorithmTypes.ED25519;
+};
+export const isAesJson = (obj: JSONKeyParams): obj is AesJSONType => {
+    const name = obj.name;
+    return Object.values(aesTypes).includes(name as AesType);
+}
+
+export type RsaJSONType = ReturnType<RsaImportParams["toJSON"]>;
+export type AesJSONType = ReturnType<AesImportParams["toJSON"]>;
+export type Ed25519JSONParams = ReturnType<Ed25519ImportParams["toJSON"]>;
+export type JSONAesGcmParams = ReturnType<AesGcmParams["toJSON"]>;
+export type AesKeyGenLength = 128 | 192 | 256;
+export type KeyParams = RsaImportParams | AesImportParams | Ed25519ImportParams;
+export type JSONKeyParams = RsaJSONType | AesJSONType | Ed25519JSONParams;
+export type KeyGenParams = RSAKeyGenParams | Ed25519KeyGenParams | AesKeyGenParams;
+export type DigestType = typeof digestTypes[keyof typeof digestTypes];
+export type AesType = typeof aesTypes[keyof typeof aesTypes];
+export type RsaType = typeof rsaTypes[keyof typeof rsaTypes];
+export type AlgorithmType = typeof algorithmTypes[keyof typeof algorithmTypes];
+export type ExportKeyFormat = typeof exportKeyFormats[keyof typeof exportKeyFormats];
+export type SignAlgorithm = typeof signAlgorithms[keyof typeof signAlgorithms];
+export type CryptAlgorithm = typeof cryptAlgorithms[keyof typeof cryptAlgorithms];
+export type JSONKey = Awaited<ReturnType<Key["toJSON"]>>;
+export type JSONPublicKey = Awaited<ReturnType<PublicKey["toJSON"]>>;
+export type JSONPrivateKey = Awaited<ReturnType<PrivateKey["toJSON"]>>;
+export type JSONKeyPair = Awaited<ReturnType<KeyPair["toJSON"]>>;
+export type PairKey = PrivateKey | PublicKey;
+type JSONEncryptExportKeyFormat = {
+    encrypt: true;
+    salt: string;
+    data: string;
+};
+type JSONDecryptExportKeyFormat = {
+    encrypt: false;
+    data: JSONKeyPair[];
+};
+export type JSONExportKeyFormat = JSONEncryptExportKeyFormat | JSONDecryptExportKeyFormat;

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/keys/keys.ts

@@ -0,0 +1,156 @@
+import {getGUID} from "../../background/utils.ts";
+import {ab2base64, base642ui, str2ui} from "../utils.ts";
+import {
+    type ExportKeyFormat,
+    exportKeyFormats, type JSONKey, type JSONKeyPair, type JSONPrivateKey, type JSONPublicKey,
+    type KeyParams,
+    keyTypes,
+    pairKeyTypes
+} from "./key-types.ts";
+import getCrypto from "../crypto.ts";
+import {AesGcmParams, getKeyParamsFromJson} from "./params.ts";
+
+export class Key {
+    params: KeyParams;
+    key;
+    exportFormat;
+    constructor(key: ArrayBuffer, params: KeyParams, exportFormat: ExportKeyFormat) {
+        this.key = key;
+        this.params = params;
+        this.exportFormat = exportFormat;
+    }
+    static async fromJSON(json: JSONKey, _masterPassword?: string, _keyUsage?: KeyUsages) {
+        const params = getKeyParamsFromJson(json.params);
+        const key = base642ui(json.key);
+        return new this(key, params, exportKeyFormats.raw);
+    }
+    async toJSON(_masterPassword?: string, _keyUsage?: KeyUsages) {
+        const key = ab2base64(this.key);
+        return {
+            params: this.params.toJSON(),
+            key: key
+        };
+    }
+}
+export class SymmetricKey extends Key {
+    type = keyTypes.symmetric;
+    keyUsages;
+    constructor(key: ArrayBuffer, params: KeyParams, keyUsage = new KeyUsages(true)) {
+        super(key, params, exportKeyFormats.raw);
+        this.keyUsages = keyUsage;
+    }
+}
+export class PublicKey extends Key {
+    type = pairKeyTypes.public;
+    constructor(key: ArrayBuffer, params: KeyParams) {
+        super(key, params, exportKeyFormats.spki);
+    }
+    static override async fromJSON(json: JSONPublicKey) {
+        const params = getKeyParamsFromJson(json.params);
+        const key = base642ui(json.key);
+        return new PublicKey(key, params);
+    }
+    override async toJSON() {
+        const params = this.params.toJSON();
+        const base64Key = ab2base64(this.key);
+        return {
+            format: exportKeyFormats.spki,
+            key: base64Key,
+            params
+        };
+    }
+}
+
+export class PrivateKey extends Key {
+    type = pairKeyTypes.private;
+    salt;
+    constructor(key: ArrayBuffer, params: KeyParams, salt: ArrayBuffer) {
+        super(key, params, exportKeyFormats.pkcs8);
+        this.salt = salt;
+    }
+    static override async fromJSON(json: JSONPrivateKey, masterPassword: string, keyUsage: KeyUsages) {
+        const salt = base642ui(json.salt);
+        const params = getKeyParamsFromJson(json.params);
+        const crypto = getCrypto();
+        const strWrapKey = json.key;
+        const wrapKey = base642ui(strWrapKey);
+        const wrapParams = new AesGcmParams();
+        wrapParams.fromJSON(json.wrapParams);
+        const key = await crypto.unwrapKey(exportKeyFormats.pkcs8, wrapKey, str2ui(masterPassword), salt, wrapParams, params, keyUsage);
+
+        return new PrivateKey(key, params, salt);
+    }
+    override async toJSON(masterPassword: string, keyUsage: KeyUsages) {
+        const crypto = getCrypto();
+        const iv = crypto.getRandomValues(12);
+        const aesParams = new AesGcmParams(iv);
+        const wrapKey = await crypto.wrapKey(this.exportFormat, this, str2ui(masterPassword), this.salt, aesParams, keyUsage);
+        const base64WrapKey = ab2base64(wrapKey);
+        const params = this.params.toJSON();
+        const wrapParams = aesParams.toJSON();
+        return {
+            format: this.exportFormat,
+            key: base64WrapKey,
+            salt: ab2base64(this.salt),
+            params,
+            wrapParams
+        };
+    }
+}
+
+export class KeyPair {
+    privateKey;
+    publicKey;
+    date;
+    type = keyTypes.pair;
+    keyUsage;
+    guid;
+    isValid;
+    static async fromJSON(json: JSONKeyPair, masterPassword: string) {
+        const keyUsage = KeyUsages.fromJSON(json.keyUsage);
+        const publicKey = await PublicKey.fromJSON(json.publicKey);
+        const privateKey = await PrivateKey.fromJSON(json.privateKey, masterPassword, keyUsage);
+        const date = new Date(json.date);
+        const guid = json.guid;
+        const isValid = json.isValid;
+        return new KeyPair(publicKey, privateKey, keyUsage, date, guid, isValid);
+    }
+    constructor(publicKey: PublicKey, privateKey: PrivateKey, keyUsage = new KeyUsages(true), date = new Date(), guid: string = getGUID(), isValid: boolean = true) {
+        this.privateKey = privateKey;
+        this.publicKey = publicKey;
+        this.date = date;
+        this.keyUsage = keyUsage;
+        this.guid = guid;
+        this.isValid = isValid;
+    }
+    async toJSON(masterPassword: string) {
+        return {
+            publicKey: await this.publicKey.toJSON(),
+            privateKey: await this.privateKey.toJSON(masterPassword, this.keyUsage),
+            date: this.date.toISOString(),
+            keyUsage: this.keyUsage.toJSON(),
+            guid: this.guid,
+            isValid: this.isValid
+        }
+    }
+    setIsValid(isValid: boolean) {
+        this.isValid = isValid;
+    };
+}
+export class KeyUsages {
+    isEncrypt;
+    isSign;
+    constructor(isEncrypt?: boolean, isSign?: boolean) {
+        this.isEncrypt = !!isEncrypt;
+        this.isSign = !!isSign;
+    }
+    static fromJSON(json: ReturnType<KeyUsages["toJSON"]>) {
+        return new KeyUsages(json.isEncrypt, json.isSign);
+    }
+    toJSON() {
+        return {
+            isEncrypt: this.isEncrypt,
+            isSign: this.isSign
+        }
+    }
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/keys/params.ts

@@ -0,0 +1,128 @@
+import {
+    type AesKeyGenLength,
+    type AesType,
+    aesTypes,
+    type AlgorithmType,
+    algorithmTypes,
+    type DigestType,
+    digestTypes, isAesJson, isEd25519Json,
+    isRSAJson,
+    type JSONAesGcmParams,
+    type JSONKeyParams,
+    type RsaJSONType,
+    type RsaType
+} from "./key-types.ts";
+import {ab2base64, base642ui} from "../utils.ts";
+
+export const getKeyParamsFromJson = (keyParamsJson: JSONKeyParams) => {
+    if (isRSAJson(keyParamsJson)) {
+        return new RsaImportParams(keyParamsJson.name, keyParamsJson.hash);
+    }
+    if (isEd25519Json(keyParamsJson)) {
+        return new Ed25519ImportParams();
+    }
+    if (isAesJson(keyParamsJson)) {
+        return new AesImportParams(keyParamsJson.name);
+    }
+    throw new Error("Unknown param type");
+};
+
+
+export class AlgorithmParams<TName extends AlgorithmType = AlgorithmType> {
+    name: TName;
+    constructor(name: TName) {
+        this.name = name;
+    }
+    toJSON() {
+        return {
+            name: this.name
+        };
+    };
+    fromJSON(json: {name: TName}) {
+        this.name = json.name;
+    }
+    getImportParams() {
+        return new AlgorithmParams(this.name);
+    }
+}
+
+export class RsaImportParams extends AlgorithmParams<RsaType> {
+    hash;
+    constructor(name: RsaType, hash: DigestType = digestTypes.SHA256) {
+        super(name);
+        this.hash = hash;
+    }
+    override toJSON() {
+        return {
+            name: this.name,
+            hash: this.hash,
+        }
+    }
+    override fromJSON(json: RsaJSONType) {
+        this.name = json.name;
+        this.hash = json.hash;
+    }
+}
+
+export class RSAKeyGenParams extends RsaImportParams {
+    modulusLength;
+    publicExponent;
+    constructor(name: RsaType, hash: DigestType = digestTypes.SHA256, modulusLength = 2048, publicExponent = new Uint8Array([0x01, 0x00, 0x01])) {
+        super(name, hash);
+        this.modulusLength = modulusLength;
+        this.publicExponent = publicExponent;
+    }
+    override getImportParams() {
+        return new RsaImportParams(this.name, this.hash);
+    }
+}
+export class Ed25519ImportParams extends AlgorithmParams<typeof algorithmTypes.ED25519> {
+    constructor() {
+        super(algorithmTypes.ED25519);
+    }
+}
+
+export class AesImportParams extends AlgorithmParams<AesType> {
+    constructor(name: AesType) {
+        super(name);
+    }
+}
+
+export class AesGcmParams {
+    name = algorithmTypes.AES_GCM;
+    iv: ArrayBuffer;
+    constructor(iv: ArrayBuffer = new Uint8Array(12)) {
+        this.iv = iv;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            iv: ab2base64(this.iv)
+        }
+    };
+    fromJSON(json: JSONAesGcmParams) {
+        this.iv = base642ui(json.iv);
+    };
+}
+
+export class AesKeyGenParams extends AesImportParams {
+    length: AesKeyGenLength;
+    constructor(name: AesType, length: AesKeyGenLength) {
+        super(name);
+        this.length = length;
+    }
+    override getImportParams() {
+        return new AesImportParams(this.name);
+    }
+}
+export class AesGcmGenParams extends AesKeyGenParams {
+    constructor() {
+        super(aesTypes.AES_GCM, 256);
+    }
+}
+export class Ed25519KeyGenParams extends Ed25519ImportParams {
+    override getImportParams() {
+        return new Ed25519ImportParams();
+    }
+}
+

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/message-const.ts

@@ -0,0 +1,20 @@
+export const messageTypes = {
+    GENERATE_KEYS: "GENERATE_KEYS",
+    POPUP_IS_OPENED: "POPUP_IS_OPENED",
+    WAIT_ENTER_PASSWORD: "WAIT_ENTER_PASSWORD",
+    SELECT_SIGN_KEYS: "SELECT_SIGN_KEYS",
+    SIGN_DATA: "SIGN_DATA",
+    VERIFY_DATA: "VERIFY_DATA",
+    ENCRYPT: "ENCRYPT",
+    ENGINE_IS_EXIST: "ENGINE_IS_EXIST"
+} as const;
+
+export const messageListeners = {
+    background: "background",
+    popup: "popup",
+} as const;
+
+export const onlyofficeChannels = {
+    onlyofficeExtensionChannel: "onlyoffice-sign-extension-channel",
+    onlyofficeClientChannel: "onlyoffice-sign-client-channel",
+} as const;

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/message-types.ts

@@ -0,0 +1,35 @@
+import {messageListeners, messageTypes} from "./message-const.ts";
+
+
+export type MessagesType = {type: typeof messageTypes[keyof typeof messageTypes]};
+
+export const isMessages = (arg: unknown): arg is MessagesType => {
+    return !!(arg && typeof arg === "object" && "type" in arg && typeof arg.type === "string" && arg.type in messageTypes);
+};
+
+export type DispatchEventMessageType = {
+    id?: number;
+    data: MessagesType;
+}
+export type AnswerMainPageEventType = {
+    id?: number;
+    data: unknown;
+};
+type Listeners = typeof messageListeners[keyof typeof messageListeners];
+type ExtensionMessage<T extends Listeners = Listeners> = {
+    data: MessagesType;
+    listener: T;
+};
+export type BackgroundMessage = ExtensionMessage<typeof messageListeners.background>;
+export type PopupMessage = ExtensionMessage<typeof messageListeners.popup>;
+
+const isExtensionMessageType  = (arg: unknown): arg is ExtensionMessage => {
+    return !!(arg && typeof arg === "object" && "data" in arg && isMessages(arg.data) && "listener" in arg && typeof arg.listener === "string");
+};
+export const isBackgroundMessageType = (arg: unknown): arg is BackgroundMessage => {
+    return isExtensionMessageType(arg) && arg.listener === messageListeners.background;
+};
+
+export const isPopupMessageType = (arg: unknown): arg is PopupMessage => {
+    return isExtensionMessageType(arg) && arg.listener === messageListeners.popup;
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/storage-manager.ts

@@ -0,0 +1,29 @@
+// @ts-ignore
+import {StorageManager} from "../../../key-storage/key-storage.js";
+import browser from "webextension-polyfill";
+import type {JSONKeyPair} from "./keys/key-types.ts";
+
+function ExtensionStorageManager() {
+    StorageManager.call(this);
+}
+ExtensionStorageManager.prototype = Object.create(StorageManager);
+ExtensionStorageManager.prototype.constructor = ExtensionStorageManager;
+ExtensionStorageManager.prototype.getStorageKeys = function() {
+    return browser.storage.local.get("keys").then(function(item) {
+        if (item && Array.isArray(item.keys)) {
+            return item.keys;
+        }
+        return [];
+    });
+};
+ExtensionStorageManager.prototype.getMasterPassword = function() {
+    return browser.storage.local.get("masterPassword").then(function(item) {
+        return item.masterPassword ? item.masterPassword : null;
+    });
+};
+ExtensionStorageManager.prototype.setStorageKeys = function(exportedKeys: JSONKeyPair[]) {
+    return browser.storage.local.set({keys: exportedKeys});
+}
+ExtensionStorageManager.prototype.setMasterPasswordWithKeys = function(exportedKeys: JSONKeyPair[]) {
+    return browser.storage.local.set({keys: exportedKeys});
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/common/utils.ts

@@ -0,0 +1,42 @@
+export function ab2str(buf: ArrayBuffer) {
+    return String.fromCharCode.apply(null, buf);
+}
+export function ab2base64(buf: ArrayBuffer) {
+    const str = ab2str(buf);
+    return btoa(str);
+}
+export function base642ui(base64: string) {
+    const str = atob(base64);
+    return str2ui(str);
+}
+export function str2ui(str: string) {
+    const ui = new Uint8Array(str.length);
+    for (let i = 0; i < str.length; i++) {
+        ui[i] = str.charCodeAt(i);
+    }
+    return ui;
+}
+
+export const selectBinary = (callback: (file: File) => void) => {
+    const input = document.createElement("input");
+    input.type = "file";
+    input.accept = "application/octet-stream";
+    input.addEventListener("change", (e) => {
+        const target = e.target as HTMLInputElement;
+        const file = target.files?.[0];
+        if (file) {
+            callback(file);
+        }
+    });
+    input.click();
+};
+
+export const downloadBinary = (data: Uint8Array) => {
+    const blob = new Blob([data], {type: "application/octet-stream"});
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement("a");
+    link.href = url;
+    link.download = `onlyoffice_keychain_${(new Date()).toISOString()}.bin`;
+    link.click();
+    URL.revokeObjectURL(url);
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/content/content.ts

@@ -0,0 +1,12 @@
+import {sendToBackground, sendToPage} from "./messenger.ts";
+import {messageTypes, onlyofficeChannels} from "../common/message-const.ts";
+import {
+    type DispatchEventMessageType,
+} from "../common/message-types.ts";
+
+window.addEventListener(onlyofficeChannels.onlyofficeExtensionChannel, (event: CustomEvent<DispatchEventMessageType>) => {
+    sendToBackground(event.detail.data).then((response: unknown) => {
+            sendToPage({id: event.detail.id, data: response});
+    });
+});
+window.dispatchEvent(new CustomEvent<DispatchEventMessageType>(onlyofficeChannels.onlyofficeClientChannel, {detail: {data: {type: messageTypes.ENGINE_IS_EXIST}}}));

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/content/messenger.ts

@@ -0,0 +1,22 @@
+import type {
+    AnswerMainPageEventType,
+    BackgroundMessage,
+    MessagesType,
+    PopupMessage
+} from "../common/message-types.ts";
+import browser from "webextension-polyfill";
+import {messageListeners, onlyofficeChannels} from "../common/message-const.ts";
+
+export const sendToBackground = async (data: MessagesType) => {
+    const backgroundData: BackgroundMessage = {data, listener: messageListeners.background};
+    return browser.runtime.sendMessage(backgroundData);
+};
+
+export const sendToPopup = async (data: MessagesType) => {
+    const sendData: PopupMessage = {listener: messageListeners.popup, data};
+    return browser.runtime.sendMessage(sendData);
+};
+
+export const sendToPage = (data: AnswerMainPageEventType) => {
+    window.dispatchEvent(new CustomEvent<AnswerMainPageEventType>(onlyofficeChannels.onlyofficeClientChannel, {detail: data}));
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/components/loader/loader.tsx

@@ -0,0 +1,3 @@
+export function Loader() {
+    return <div>Loading...</div>;
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/components/password-input/password-input.tsx

@@ -0,0 +1,12 @@
+type PropsType = {
+    name: string;
+    labelText: string;
+    onChange: (e: string) => void;
+}
+
+export default function PasswordInput({onChange, name, labelText}: PropsType) {
+    return <>
+        <label htmlFor={name}>{labelText}</label>
+        <input required={true} minLength={8} onChange={(e) => onChange(e.target.value)} type="password" name={name}/>
+    </>;
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/main.tsx

@@ -0,0 +1,9 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import App from './pages/app/app.tsx'
+
+createRoot(document.getElementById('root')!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+)

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/app/app.tsx

@@ -0,0 +1,91 @@
+import {useState, useEffect} from 'react'
+import Login from "../login/login.tsx";
+import {getStorageMasterPassword, initCheckOpenedPopup, setStorageMasterPassword} from "../../../utils/utils.ts";
+import {useTaskManager} from "../../../task-manager/task-manager.ts";
+import {Dashboard} from "../dashboard/dashboard.tsx";
+// @ts-ignore
+import {StorageManager} from "../storage-manager/storage-manager.ts";
+import {KeyPair} from "../../../../common/keys/keys.ts";
+import {Ed25519KeyGenParams} from "../../../../common/keys/params.ts";
+import {ChangePasswordPage} from "../change-password/change-password.tsx";
+import {locations} from "../../../utils/locations.ts";
+import SelectKeysPage from "../select-keys/select-keys.tsx";
+import {messageTypes} from "../../../../common/message-const.ts";
+const storageManager = new StorageManager();
+const generateKeys = async () => {
+    const key = await storageManager.generateKeys(new Ed25519KeyGenParams());
+    if (key) {
+        await storageManager.addNewKeys([key]);
+        return key;
+    }
+};
+
+
+export default function App() {
+    const [localMasterPassword, setLocalMasterPassword] = useState<string | null>(null);
+    const [keys, setKeys] = useState<KeyPair[]>([]);
+    const {location, setLocation, promiseRef} = useTaskManager();
+    useEffect(() => {
+       (async () => {
+           const storageMasterPassword = await getStorageMasterPassword();
+           setLocalMasterPassword(storageMasterPassword);
+           await storageManager.loadKeysFromStorage();
+           setKeys(storageManager.getValidKeys());
+        })();
+        initCheckOpenedPopup();
+    }, []);
+
+    const handleSelectKey = (e: React.MouseEvent<HTMLLIElement>) => {
+        if (promiseRef.current) {
+            const guid = e.currentTarget.dataset.guid;
+            if (promiseRef.current.messageId === messageTypes.SELECT_SIGN_KEYS && guid) {
+                promiseRef.current.resolve(guid);
+            } else {
+                promiseRef.current.reject("Another task was expected to resolve");
+            }
+        }
+        promiseRef.current = null;
+        window.close();
+    };
+
+    const handleSubmitMasterPassword = (masterPassword: string) => {
+        setStorageMasterPassword(masterPassword);
+        setLocalMasterPassword(masterPassword);
+    };
+
+    const handleSubmitNewMasterPassword = async (newMasterPassword: string) => {
+        await storageManager.changeMasterPassword(newMasterPassword);
+        setLocalMasterPassword(newMasterPassword);
+        setLocation("");
+    };
+
+    const handleGenerateKeys = async () => {
+      const keyPair = await generateKeys();
+      if (keyPair) {
+          setKeys(storageManager.getValidKeys());
+      }
+    };
+    const handleExportKeys = () => {
+        storageManager.exportKeys();
+    }
+    const handleImportKeys = async () => {
+        storageManager.importKeys(() => {setKeys(storageManager.getValidKeys())});
+    }
+
+    const handleDeprecateKey = async (key: KeyPair) => {
+        await storageManager.deprecateKey(key);
+        setKeys(storageManager.getValidKeys());
+    };
+    const isLoggedOut = localMasterPassword === null;
+    return (
+        <>
+            {
+                isLoggedOut ?
+                <Login handleSubmitMasterPassword={handleSubmitMasterPassword} /> :
+                location === locations.changeMasterPassword ? <ChangePasswordPage handleSubmitNewMasterPassword={handleSubmitNewMasterPassword} /> :
+                location === locations.selectKeys ? <SelectKeysPage keys={keys} handleKey={handleSelectKey}/> :
+                <Dashboard handleDeprecateKey={handleDeprecateKey} changeLocation={setLocation} handleImportKeys={handleImportKeys} handleExportKeys={handleExportKeys} handleGenerateSignKeys={handleGenerateKeys} keys={keys} masterPassword={localMasterPassword}/>
+            }
+        </>
+    )
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/change-password/change-password.tsx

@@ -0,0 +1,31 @@
+import PasswordInput from "../../components/password-input/password-input.tsx";
+import {type FormEvent, useState} from "react";
+import {compareWithOldMasterPassword} from "../../../utils/utils.ts";
+
+type ChangePasswordPageProps = {
+    handleSubmitNewMasterPassword: (newMasterPassword: string) => void;
+};
+export function ChangePasswordPage({handleSubmitNewMasterPassword}: ChangePasswordPageProps) {
+    const [oldMasterPassword, setOldMasterPassword] = useState("");
+    const [newMasterPassword, setNewMasterPassword] = useState("");
+    const [confirmMasterPassword, setConfirmMasterPassword] = useState("");
+    const [error, setError] = useState("");
+    const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        const isEqualsOldPassword = await compareWithOldMasterPassword(oldMasterPassword);
+        if (!isEqualsOldPassword) {
+            setError("Check if you entered your old password correctly.");
+        } else if (newMasterPassword !== confirmMasterPassword) {
+            setError("The new passwords do not match.");
+        } else {
+            handleSubmitNewMasterPassword(newMasterPassword);
+        }
+    };
+    return <form onSubmit={onSubmit}>
+        <PasswordInput name={"old-password"} labelText={"Enter old master password"} onChange={setOldMasterPassword}/>
+        <PasswordInput name={"new-password"} labelText={"Enter new master password"} onChange={setNewMasterPassword}/>
+        <PasswordInput name={"confirm-new-password"} labelText={"Confirm new master password"} onChange={setConfirmMasterPassword}/>
+        {error && <div>{error}</div>}
+        <button type={"submit"}>Confirm</button>
+    </form>
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/dashboard/dashboard.module.css

@@ -0,0 +1,8 @@
+
+.wrapper {
+    display: flex;
+    justify-content: space-between;
+    :hover {
+        background-color: rgba(240 , 240, 240, 255);
+    }
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/dashboard/dashboard.tsx

@@ -0,0 +1,29 @@
+import type {KeyPair} from "../../../../common/keys/keys.ts";
+import {locations} from "../../../utils/locations.ts";
+import css from "./dashboard.module.css";
+
+type DashboardProps = {
+    masterPassword: string;
+    keys: KeyPair[];
+    handleGenerateSignKeys: () => Promise<void>
+    handleImportKeys: () => void;
+    handleExportKeys: () => void;
+    handleDeprecateKey: (key: KeyPair) => void;
+    changeLocation: (location: string) => void
+};
+
+export function Dashboard({keys, handleDeprecateKey, masterPassword, handleGenerateSignKeys, handleImportKeys, handleExportKeys, changeLocation}: DashboardProps) {
+    return <div>
+        <div>Hello, your master password: {masterPassword}</div>
+        <button onClick={() => {changeLocation(locations.changeMasterPassword)}}>Change password</button>
+        <button onClick={handleExportKeys}>Export keys</button>
+        <button onClick={handleImportKeys}>Import keys</button>
+        <button onClick={handleGenerateSignKeys}>Generate sign keys</button>
+        <div>Generated sign keys</div>
+        {keys.map((key, idx) =>
+            <div key={idx} className={css.wrapper}>
+            <div>{key.guid}</div>
+            <div onClick={() => handleDeprecateKey(key)}>&times;</div>
+        </div>)}
+    </div>
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/login/login.tsx

@@ -0,0 +1,25 @@
+import {type FormEvent, useState} from "react";
+import PasswordInput from "../../components/password-input/password-input.tsx";
+
+type LoginProps = {
+    handleSubmitMasterPassword: (password: string) => void;
+};
+export default function Login({handleSubmitMasterPassword}: LoginProps) {
+    const [masterPassword, setMasterPassword] = useState("");
+    const [confirmMasterPassword, setConfirmMasterPassword] = useState("");
+    const [error, setError] = useState("");
+    const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        if (masterPassword === confirmMasterPassword) {
+            handleSubmitMasterPassword(masterPassword);
+        } else {
+            setError("The passwords don't match");
+        }
+    };
+    return <form onSubmit={handleSubmit}>
+        <PasswordInput name={"login-password"} labelText={"Enter new master password"} onChange={setMasterPassword}/>
+        <PasswordInput name={"login-confirm-password"} labelText={"Confirm new master password"} onChange={setConfirmMasterPassword}/>
+        {error && <div>{error}</div>}
+        <button type={"submit"}>Confirm</button>
+    </form>
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/select-keys/select-keys.module.css

@@ -0,0 +1,6 @@
+.key {
+    cursor: pointer;
+    &:hover {
+        background-color: rgba(0, 0, 0, 10%);
+    }
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/App/pages/select-keys/select-keys.tsx

@@ -0,0 +1,16 @@
+import type {KeyPair} from "../../../../common/keys/keys.ts";
+import type {MouseEventHandler} from "react";
+import css from "./select-keys.module.css";
+
+type TSelectKeysProps = {
+    keys: KeyPair[];
+    handleKey: MouseEventHandler<HTMLLIElement>;
+};
+
+export default function SelectKeysPage({keys, handleKey}: TSelectKeysProps) {
+    return <ul>
+        {keys.map((key) => <li className={css.key} key={key.guid} data-guid={key.guid} onClick={handleKey}>
+            {key.guid}
+        </li>)}
+    </ul>
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/index.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/popup/App/main.tsx"></script>
+  </body>
+</html>

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/task-manager/task-manager.ts

@@ -0,0 +1,46 @@
+import browser from "webextension-polyfill";
+import {isPopupMessageType} from "../../common/message-types.ts";
+import {messageTypes} from "../../common/message-const.ts";
+import {isStorageLogged, selectSignKeys} from "./tasks.ts";
+import {useEffect, useRef, useState} from "react";
+
+type TSelectKeysPromise = {
+  resolve: (guid: string) => void;
+  messageId: typeof messageTypes.SELECT_SIGN_KEYS
+};
+type TPromiseArgs = {
+    reject: (error: string) => void;
+} & (TSelectKeysPromise);
+export type TPromiseRef = (newResolve: TPromiseArgs["resolve"], newReject: TPromiseArgs["reject"], id: TPromiseArgs["messageId"]) => void;
+export const useTaskManager = () => {
+    const [location, setLocation] = useState("");
+    const promiseRef = useRef<TPromiseArgs | null>(null);
+    const setPromiseRef: TPromiseRef = (newResolve, newReject, id) => {
+        if (promiseRef.current) {
+            promiseRef.current.reject("Another task has been selected");
+        }
+        promiseRef.current = {resolve: newResolve, reject: newReject, messageId: id};
+    }
+    useEffect(() => {
+        const listener = (message: unknown) => {
+            if (!isPopupMessageType(message)) {
+                return false;
+            }
+            const data = message.data;
+            switch (data.type) {
+                case messageTypes.WAIT_ENTER_PASSWORD: {
+                    return isStorageLogged();
+                }
+                case messageTypes.SELECT_SIGN_KEYS: {
+                    return selectSignKeys(setLocation, setPromiseRef);
+                }
+            }
+            return false;
+        };
+        browser.runtime.onMessage.addListener(listener);
+        return () => {
+            browser.runtime.onMessage.removeListener(listener);
+        }
+    }, []);
+    return {location, setLocation, promiseRef};
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/task-manager/tasks.ts

@@ -0,0 +1,16 @@
+import {checkIsStorageLogged} from "../utils/utils.ts";
+import {locations} from "../utils/locations.ts";
+import {messageTypes} from "../../common/message-const.ts";
+import type {TPromiseRef} from "./task-manager.ts";
+
+export const isStorageLogged = async () => {
+    await checkIsStorageLogged();
+    return true;
+};
+
+export const selectSignKeys = (setNavigation: (location: string) => void, setPromiseRef: TPromiseRef): Promise<string> => {
+    setNavigation(locations.selectKeys);
+    return new Promise((resolve, reject) => {
+       setPromiseRef(resolve, reject, messageTypes.SELECT_SIGN_KEYS);
+    });
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/utils/locations.ts

@@ -0,0 +1,4 @@
+export const locations = {
+    changeMasterPassword: "changeMasterPassword",
+    selectKeys: "selectKeys",
+} as const;

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/popup/utils/utils.ts

@@ -0,0 +1,38 @@
+import browser from "webextension-polyfill";
+export const getStorageMasterPassword = async () => {
+    const masterPassword = await browser.storage.local.get('masterPassword');
+    if (masterPassword && typeof masterPassword.masterPassword === 'string') {
+        return masterPassword.masterPassword;
+    }
+    return null;
+}
+export const compareWithOldMasterPassword = async (checkPassword: string) => {
+    const masterPassword = await getStorageMasterPassword();
+    return masterPassword === checkPassword;
+}
+export const setStorageMasterPassword = (masterPassword: string) => {
+    browser.storage.local.set({masterPassword});
+}
+
+export const checkIsStorageLogged = async () => {
+    const masterPassword = await getStorageMasterPassword();
+    if (masterPassword) {
+        return true;
+    }
+    return getChangedProperty("masterPassword");
+};
+const getChangedProperty = (key: string) => {
+    return new Promise((resolve) => {
+        browser.storage.local.onChanged.addListener(function handler(change) {
+            if (change[key]) {
+                browser.storage.local.onChanged.removeListener(handler);
+                resolve(change[key].newValue);
+            }
+        });
+    });
+};
+
+export const initCheckOpenedPopup = () => {
+    const port = browser.runtime.connect({ name: "popup" });
+    port.postMessage({ opened: true });
+};

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/types.d.ts

@@ -0,0 +1,7 @@
+export {};
+
+declare global {
+    interface WindowEventMap {
+        "onlyoffice-sign-extension-channel": CustomEvent;
+    }
+}

DesktopEditor/xmlsec/src/wasm/extension/extension2/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

DesktopEditor/xmlsec/src/wasm/extension/extension2/tsconfig.app.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2022",
+    "useDefineForClassFields": true,
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "erasableSyntaxOnly": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true,
+	"noImplicitOverride": true,
+	"resolveJsonModule": true
+  },
+  "include": ["src"]
+}