1 files changed, 6 insertions, 23 deletions

diff --git a/deps/openssl/openssl/engines/ccgost/gost_crypt.c b/deps/openssl/openssl/engines/ccgost/gost_crypt.c
index 52aef15acf..cde58c0e9b 100644
--- a/deps/openssl/openssl/engines/ccgost/gost_crypt.c
+++ b/deps/openssl/openssl/engines/ccgost/gost_crypt.c
@@ -11,14 +11,6 @@
 #include <openssl/rand.h>
 #include "e_gost_err.h"
 #include "gost_lcl.h"
-
-#if !defined(CCGOST_DEBUG) && !defined(DEBUG)
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
 static int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
 	const unsigned char *iv, int enc);
 static int	gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key,
@@ -214,13 +206,12 @@ int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 static void gost_crypt_mesh (void *ctx,unsigned char *iv,unsigned char *buf)
 	{
 	struct ossl_gost_cipher_ctx *c = ctx;
-	assert(c->count%8 == 0 && c->count <= 1024);
-	if (c->key_meshing && c->count==1024)
+	if (c->count&&c->key_meshing && c->count%1024==0)
 		{
 		cryptopro_key_meshing(&(c->cctx),iv);
 		}	
 	gostcrypt(&(c->cctx),iv,buf);
-	c->count = c->count%1024 + 8;
+	c->count+=8;
 	}
 
 static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
@@ -228,8 +219,7 @@ static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
 	struct ossl_gost_cipher_ctx *c = ctx;
 	word32 g,go;
 	unsigned char buf1[8];
-	assert(c->count%8 == 0 && c->count <= 1024);
-	if (c->key_meshing && c->count==1024)
+	if (c->count && c->key_meshing && c->count %1024 ==0)
 		{
 		cryptopro_key_meshing(&(c->cctx),iv);
 		}
@@ -258,7 +248,7 @@ static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
 	buf1[7]=(unsigned char)((g>>24)&0xff);
 	memcpy(iv,buf1,8);
 	gostcrypt(&(c->cctx),buf1,buf);
-	c->count = c->count%1024 + 8;
+	c->count +=8;
 	}
 
 /* GOST encryption in CFB mode */
@@ -521,13 +511,12 @@ static void mac_block_mesh(struct ossl_gost_imit_ctx *c,const unsigned char *dat
 	 * interpret internal state of MAC algorithm as iv during keymeshing
 	 * (but does initialize internal state from iv in key transport
 	 */
-	assert(c->count%8 == 0 && c->count <= 1024);
-	if (c->key_meshing && c->count==1024)
+	if (c->key_meshing&& c->count && c->count %1024 ==0)
 		{
 		cryptopro_key_meshing(&(c->cctx),buffer);
 		}
 	mac_block(&(c->cctx),c->buffer,data);
-	c->count = c->count%1024 + 8;
+	c->count +=8;
 	}
 
 int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
@@ -576,12 +565,6 @@ int gost_imit_final(EVP_MD_CTX *ctx,unsigned char *md)
 		GOSTerr(GOST_F_GOST_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET);
 		return 0;
 	}
-	if (c->count==0 && c->bytes_left)
-		{
-		unsigned char buffer[8];
-		memset(buffer, 0, 8);
-		gost_imit_update(ctx, buffer, 8);
-		}
 	if (c->bytes_left)
 		{
 		int i;