Merge branch 'gost89-cbc'

Conflicts:
	e_gost_err.h

diff --cc e_gost_err.c
index ab0a7f4c02f94c52f789610ad6e4bb489d6c8bce,376d18b830ba1c2c136ead2ea5e35377b240b3fb..8f3b35b5afbe8636084e9d541d54b011b51f9e03
--- 1/e_gost_err.c
--- 2/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"},

diff --cc gost_crypt.c
Simple merge