From 498301e4e9d1beba21a65c3becdb9c16e2f3711e Mon Sep 17 00:00:00 2001
From: Alexey <esin.alexeyy@gmail.com>
Date: Thu, 22 Jun 2023 06:38:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=B2=D1=85=D0=BE=D0=B4=D1=8F=D1=89=D0=B5=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20createHash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: vgoma <vgoma@yandex.ru>
---
 src/api/createHash.test.ts |  6 ++++++
 src/api/createHash.ts      | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/api/createHash.test.ts b/src/api/createHash.test.ts
index baf00af..daebc77 100644
--- a/src/api/createHash.test.ts
+++ b/src/api/createHash.test.ts
@@ -41,4 +41,10 @@ describe('createHash', () => {
 
     expect(hash).toEqual('hash');
   });
+
+  test('returns created hash with specified encoding', async () => {
+    const hash = await createHash('message', { encoding: 'binary' });
+
+    expect(hash).toEqual('hash');
+  });
 });
diff --git a/src/api/createHash.ts b/src/api/createHash.ts
index 093b0ea..b60d8b0 100644
--- a/src/api/createHash.ts
+++ b/src/api/createHash.ts
@@ -1,7 +1,13 @@
+import { TranscodeEncoding } from 'buffer';
 import { _afterPluginsLoaded } from '../helpers/_afterPluginsLoaded';
 import { _extractMeaningfulErrorMessage } from '../helpers/_extractMeaningfulErrorMessage';
 import { __cadesAsyncToken__, __createCadesPluginObject__, _generateCadesFn } from '../helpers/_generateCadesFn';
 
+type Options = {
+  hashedAlgorithm?: number;
+  encoding?: TranscodeEncoding;
+};
+
 /**
  * Создает хеш сообщения по ГОСТ Р 34.11-2012 (по умолчанию 256 бит)
  * https://ru.wikipedia.org/wiki/%D0%A1%D1%82%D1%80%D0%B8%D0%B1%D0%BE%D0%B3_(%D1%85%D0%B5%D1%88-%D1%84%D1%83%D0%BD%D0%BA%D1%86%D0%B8%D1%8F)
@@ -12,7 +18,7 @@ import { __cadesAsyncToken__, __createCadesPluginObject__, _generateCadesFn } fr
  * @returns хеш
  */
 export const createHash = _afterPluginsLoaded(
-  async (unencryptedMessage: string | ArrayBuffer, hashedAlgorithm?: number): Promise<string> => {
+  async (unencryptedMessage: string | ArrayBuffer, options?: Options): Promise<string> => {
     const { cadesplugin } = window;
 
     return eval(
@@ -22,7 +28,11 @@ export const createHash = _afterPluginsLoaded(
         let hash;
 
         try {
-          messageBase64 = Buffer.from(unencryptedMessage).toString('base64');
+          if (options?.encoding && typeof unencryptedMessage === 'string') {
+            messageBase64 = Buffer.from(unencryptedMessage, options?.encoding).toString('base64');
+          } else {
+            messageBase64 = Buffer.from(unencryptedMessage).toString('base64');
+          }
         } catch (error) {
           console.error(error);
 
@@ -33,7 +43,7 @@ export const createHash = _afterPluginsLoaded(
           void (
             __cadesAsyncToken__ +
             cadesHashedData.propset_Algorithm(
-              hashedAlgorithm ?? cadesplugin.CADESCOM_HASH_ALGORITHM_CP_GOST_3411_2012_256,
+              options?.hashedAlgorithm ?? cadesplugin.CADESCOM_HASH_ALGORITHM_CP_GOST_3411_2012_256,
             )
           );
           void (__cadesAsyncToken__ + cadesHashedData.propset_DataEncoding(cadesplugin.CADESCOM_BASE64_TO_BINARY));