From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Tue, 6 Oct 2015 17:57:10 +0000 (+0300)
Subject: Merge branch 'gost89-cbc'
X-Git-Tag: v1.1.0.2~44
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=b13fa6d0cdd810841c3bbac1899f7a3b4083f23f;p=openssl-gost%2Fengine.git

Merge branch 'gost89-cbc'

Conflicts:
	e_gost_err.h
---

b13fa6d0cdd810841c3bbac1899f7a3b4083f23f
diff --cc e_gost_err.c
index ab0a7f4,376d18b..8f3b35b
--- a/e_gost_err.c
+++ b/e_gost_err.c
@@@ -127,7 -139,10 +127,9 @@@ static ERR_STRING_DATA GOST_str_reasons
      {ERR_REASON(GOST_R_INVALID_DIGEST_TYPE), "invalid digest type"},
      {ERR_REASON(GOST_R_INVALID_IV_LENGTH), "invalid iv length"},
      {ERR_REASON(GOST_R_INVALID_MAC_KEY_LENGTH), "invalid mac key length"},
+     {ERR_REASON(GOST_R_INVALID_MAC_KEY_SIZE) ,"invalid mac key size"},
+     {ERR_REASON(GOST_R_INVALID_MAC_SIZE)     ,"invalid mac size"},
      {ERR_REASON(GOST_R_INVALID_PARAMSET), "invalid paramset"},
 -    {ERR_REASON(GOST_R_KEY_IS_NOT_INITALIZED), "key is not initalized"},
      {ERR_REASON(GOST_R_KEY_IS_NOT_INITIALIZED), "key is not initialized"},
      {ERR_REASON(GOST_R_KEY_PARAMETERS_MISSING), "key parameters missing"},
      {ERR_REASON(GOST_R_MAC_KEY_NOT_SET), "mac key not set"},