From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sun, 10 May 2020 14:15:45 +0000 (+0300)
Subject: Merge branch 'master' of https://github.com/gost-engine/engine
X-Git-Tag: v3.0.0~122
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=ea599c11e431540582ccc6ca785ea6579fa248fc;hp=3acdb02cede3259cb77b71368c8c581b1734c127;p=openssl-gost%2Fengine.git

Merge branch 'master' of https://github.com/gost-engine/engine
---

diff --git a/gost_crypt.c b/gost_crypt.c
index 33dc668..2bede85 100644
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -867,6 +867,9 @@ static int magma_cipher_do_ctr_acpkm_omac(EVP_CIPHER_CTX *ctx, unsigned char *ou
 	if (in == NULL && inl == 0) /* Final call */
 		return gost2015_final_call(ctx, c->omac_ctx, MAGMA_MAC_MAX_SIZE, c->tag, magma_cipher_do_ctr);
 
+  if (in == NULL)
+      return -1;
+
 	/* As in and out can be the same pointer, process unencrypted here */
 	if (EVP_CIPHER_CTX_encrypting(ctx))
 		EVP_DigestSignUpdate(c->omac_ctx, in, inl);