diff --git a/DesktopEditor/doctrenderer/doctrenderer.pro b/DesktopEditor/doctrenderer/doctrenderer.pro
index 647fd06b9f..6f7692b356 100644
--- a/DesktopEditor/doctrenderer/doctrenderer.pro
+++ b/DesktopEditor/doctrenderer/doctrenderer.pro
@@ -29,8 +29,7 @@ SOURCES += \
     docbuilder.cpp \
     docbuilder_p.cpp \
     graphics.cpp \
-	hash.cpp \
-	hash_engine.cpp
+	hash.cpp
 
 SOURCES += \
     ../../Common/OfficeFileFormatChecker2.cpp \
diff --git a/DesktopEditor/doctrenderer/hash.cpp b/DesktopEditor/doctrenderer/hash.cpp
index d554942429..29184af382 100644
--- a/DesktopEditor/doctrenderer/hash.cpp
+++ b/DesktopEditor/doctrenderer/hash.cpp
@@ -4,6 +4,13 @@
 #include "../common/Base64.h"
 #endif
 
+#include "openssl/sha.h"
+#include "openssl/md2.h"
+#include "openssl/md4.h"
+#include "openssl/md5.h"
+#include "openssl/whrlpool.h"
+#include "openssl/ripemd.h"
+
 #include <cstring>
 #include <memory>
 
@@ -23,10 +30,79 @@ CHash::~CHash()
 
 unsigned char* CHash::hash(const unsigned char* data, int size, int alg)
 {
-	unsigned int nBufLen = (unsigned int)getDigestLength((HashAlgs)alg);
-	unsigned char* pBufData = (unsigned char*)m_fAllocator(nBufLen);
+	unsigned int nBufLen = 0;
+	unsigned char* pBufData = NULL;
+	size_t d = (size_t)size;
+
+	switch (alg)
+	{
+	case haMD2:
+	{
+		nBufLen = 16;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		MD2(data, d, pBufData);
+		break;
+	}
+	case haMD4:
+	{
+		nBufLen = 16;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		MD4(data, d, pBufData);
+		break;
+	}
+	case haMD5:
+	{
+		nBufLen = 16;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		MD5(data, d, pBufData);
+		break;
+	}
+	case haRMD160:
+	{
+		nBufLen = 20;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		RIPEMD160(data, d, pBufData);
+		break;
+	}
+	case haSHA1:
+	{
+		nBufLen = 20;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		SHA1(data, d, pBufData);
+		break;
+	}
+	case haSHA256:
+	{
+		nBufLen = 32;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		SHA256(data, d, pBufData);
+		break;
+	}
+	case haSHA384:
+	{
+		nBufLen = 48;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		SHA384(data, d, pBufData);
+		break;
+	}
+	case haSHA512:
+	{
+		nBufLen = 64;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		SHA512(data, d, pBufData);
+		break;
+	}
+	case haWHIRLPOOL:
+	{
+		nBufLen = 64;
+		pBufData = (unsigned char*)m_fAllocator(nBufLen);
+		WHIRLPOOL(data, d, pBufData);
+		break;
+	}
+	default:
+		break;
+	}
 
-	NSHash::hash_internal(data, pBufData, (size_t)size, alg);
 	return pBufData;
 }
 
@@ -167,7 +243,56 @@ void hash_iteration(unsigned char*& input, int iter, unsigned char*& tmp, int al
 	input[alg_size + 2] = 0xFF & (iter >> 16);
 	input[alg_size + 3] = 0xFF & (iter >> 24);
 
-	NSHash::hash_internal(input, tmp, alg_size + 4, alg);
+	switch (alg)
+	{
+	case CHash::haMD2:
+	{
+		MD2(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haMD4:
+	{
+		MD4(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haMD5:
+	{
+		MD5(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haRMD160:
+	{
+		RIPEMD160(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haSHA1:
+	{
+		SHA1(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haSHA256:
+	{
+		SHA256(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haSHA384:
+	{
+		SHA384(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haSHA512:
+	{
+		SHA512(input, alg_size + 4, tmp);
+		break;
+	}
+	case CHash::haWHIRLPOOL:
+	{
+		WHIRLPOOL(input, alg_size + 4, tmp);
+		break;
+	}
+	default:
+		break;
+	}
 
 	unsigned char* mem = input;
 	input = tmp;
@@ -189,9 +314,76 @@ unsigned char* CHash::hash2(const char* password, const char* salt, int spinCoun
 
 	free(passwordUtf16);
 
-	size_t alg_size = (size_t)getDigestLength((HashAlgs)alg);
-	unsigned char* pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
-	NSHash::hash_internal(inputData, pBuffer1, (size_t)inputDataLen, alg);
+	size_t alg_size = 0;
+	unsigned char* pBuffer1 = NULL;
+	switch (alg)
+	{
+	case haMD2:
+	{
+		alg_size = 16;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		MD2(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haMD4:
+	{
+		alg_size = 16;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		MD4(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haMD5:
+	{
+		alg_size = 16;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		MD5(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haRMD160:
+	{
+		alg_size = 20;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		RIPEMD160(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haSHA1:
+	{
+		alg_size = 20;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		SHA1(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haSHA256:
+	{
+		alg_size = 32;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		SHA256(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haSHA384:
+	{
+		alg_size = 48;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		SHA384(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haSHA512:
+	{
+		alg_size = 64;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		SHA512(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	case haWHIRLPOOL:
+	{
+		alg_size = 64;
+		pBuffer1 = (unsigned char*)m_fAllocator(alg_size + 4);
+		WHIRLPOOL(inputData, inputDataLen, pBuffer1);
+		break;
+	}
+	default:
+		break;
+	}
 
 	free(inputData);
 
diff --git a/DesktopEditor/doctrenderer/hash.h b/DesktopEditor/doctrenderer/hash.h
index 4e659f2336..27595edd3c 100644
--- a/DesktopEditor/doctrenderer/hash.h
+++ b/DesktopEditor/doctrenderer/hash.h
@@ -10,7 +10,7 @@ namespace NSHash
 	void BUILDER_DECL hash_internal(const unsigned char* src, unsigned char* dst, size_t size, int alg);
 }
 
-class CHash
+class BUILDER_DECL CHash
 {	
 public:
 	enum HashAlgs
diff --git a/DesktopEditor/doctrenderer/hash_engine.cpp b/DesktopEditor/doctrenderer/hash_engine.cpp
deleted file mode 100644
index 274f579ad3..0000000000
--- a/DesktopEditor/doctrenderer/hash_engine.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "hash.h"
-
-#include "openssl/sha.h"
-#include "openssl/md2.h"
-#include "openssl/md4.h"
-#include "openssl/md5.h"
-#include "openssl/whrlpool.h"
-#include "openssl/ripemd.h"
-
-#include <memory>
-
-void NSHash::hash_internal(const unsigned char* src, unsigned char* dst, size_t d, int alg)
-{
-	switch (alg)
-	{
-	case CHash::haMD2:
-	{
-		MD2(src, d, dst);
-		break;
-	}
-	case CHash::haMD4:
-	{
-		MD4(src, d, dst);
-		break;
-	}
-	case CHash::haMD5:
-	{
-		MD5(src, d, dst);
-		break;
-	}
-	case CHash::haRMD160:
-	{
-		RIPEMD160(src, d, dst);
-		break;
-	}
-	case CHash::haSHA1:
-	{
-		SHA1(src, d, dst);
-		break;
-	}
-	case CHash::haSHA256:
-	{
-		SHA256(src, d, dst);
-		break;
-	}
-	case CHash::haSHA384:
-	{
-		SHA384(src, d, dst);
-		break;
-	}
-	case CHash::haSHA512:
-	{
-		SHA512(src, d, dst);
-		break;
-	}
-	case CHash::haWHIRLPOOL:
-	{
-		WHIRLPOOL(src, d, dst);
-		break;
-	}
-	default:
-		break;
-	}
-}
diff --git a/DesktopEditor/xmlsec/src/wasm/hash/main.cpp b/DesktopEditor/xmlsec/src/wasm/hash/main.cpp
index 4aa2da987a..eed832c67a 100644
--- a/DesktopEditor/xmlsec/src/wasm/hash/main.cpp
+++ b/DesktopEditor/xmlsec/src/wasm/hash/main.cpp
@@ -96,7 +96,7 @@ namespace NSBase64
 }
 
 #define OWN_BASE_64
-#include "../../../../doctrenderer/hash_engine.cpp"
+#define DOCTRENDERER_NO_USE_DYNAMIC_LIBRARY
 #include "../../../../doctrenderer/hash.cpp"
 
 #ifdef __cplusplus