X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;ds=sidebyside;f=e_gost_err.c;h=6251b78dafe05386ef5f14bae020ff461c373f94;hb=e0a500ab877ba72cb14026a24d462dd923b90ced;hp=c71272e2c4fe09805f0e7c460f6576ba96c1125c;hpb=4dc691d1177ad328f34bee01128b3a8aa23b2547;p=openssl-gost%2Fengine.git

diff --git a/e_gost_err.c b/e_gost_err.c
index c71272e..6251b78 100644
--- a/e_gost_err.c
+++ b/e_gost_err.c
@@ -54,8 +54,12 @@ static ERR_STRING_DATA GOST_str_functs[] = {
      "gost_grasshopper_cipher_ctl"},
     {ERR_PACK(0, GOST_F_GOST_GRASSHOPPER_CIPHER_DO_CTRACPKM_OMAC, 0),
      "gost_grasshopper_cipher_do_ctracpkm_omac"},
+    {ERR_PACK(0, GOST_F_GOST_GRASSHOPPER_CIPHER_DO_MGM, 0),
+     "gost_grasshopper_cipher_do_mgm"},
     {ERR_PACK(0, GOST_F_GOST_GRASSHOPPER_CIPHER_INIT_CTRACPKM_OMAC, 0),
      "gost_grasshopper_cipher_init_ctracpkm_omac"},
+    {ERR_PACK(0, GOST_F_GOST_GRASSHOPPER_MGM_CTRL, 0),
+     "gost_grasshopper_mgm_ctrl"},
     {ERR_PACK(0, GOST_F_GOST_GRASSHOPPER_SET_ASN1_PARAMETERS, 0),
      "gost_grasshopper_set_asn1_parameters"},
     {ERR_PACK(0, GOST_F_GOST_IMIT_CTRL, 0), "gost_imit_ctrl"},
@@ -64,6 +68,12 @@ static ERR_STRING_DATA GOST_str_functs[] = {
     {ERR_PACK(0, GOST_F_GOST_KDFTREE2012_256, 0), "gost_kdftree2012_256"},
     {ERR_PACK(0, GOST_F_GOST_KEXP15, 0), "gost_kexp15"},
     {ERR_PACK(0, GOST_F_GOST_KIMP15, 0), "gost_kimp15"},
+    {ERR_PACK(0, GOST_F_GOST_MAGMA_CIPHER_DO_MGM, 0),
+     "gost_magma_cipher_do_mgm"},
+    {ERR_PACK(0, GOST_F_GOST_MAGMA_MGM_CTRL, 0), "gost_magma_mgm_ctrl"},
+    {ERR_PACK(0, GOST_F_GOST_MGM128_AAD, 0), "gost_mgm128_aad"},
+    {ERR_PACK(0, GOST_F_GOST_MGM128_DECRYPT, 0), "gost_mgm128_decrypt"},
+    {ERR_PACK(0, GOST_F_GOST_MGM128_ENCRYPT, 0), "gost_mgm128_encrypt"},
     {ERR_PACK(0, GOST_F_MAGMA_CIPHER_CTL, 0), "magma_cipher_ctl"},
     {ERR_PACK(0, GOST_F_MAGMA_CIPHER_CTL_ACPKM_OMAC, 0),
      "magma_cipher_ctl_acpkm_omac"},
@@ -129,6 +139,7 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
     "cannot unpack ephemeral key"},
     {ERR_PACK(0, 0, GOST_R_CIPHER_NOT_FOUND), "cipher not found"},
     {ERR_PACK(0, 0, GOST_R_CTRL_CALL_FAILED), "ctrl call failed"},
+    {ERR_PACK(0, 0, GOST_R_DATA_TOO_LARGE), "data too large"},
     {ERR_PACK(0, 0, GOST_R_ERROR_COMPUTING_EXPORT_KEYS),
     "error computing export keys"},
     {ERR_PACK(0, 0, GOST_R_ERROR_COMPUTING_SHARED_KEY),
@@ -141,6 +152,7 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
     {ERR_PACK(0, 0, GOST_R_ERROR_SETTING_PEER_KEY), "error setting peer key"},
     {ERR_PACK(0, 0, GOST_R_INCOMPATIBLE_ALGORITHMS), "incompatible algorithms"},
     {ERR_PACK(0, 0, GOST_R_INCOMPATIBLE_PEER_KEY), "incompatible peer key"},
+    {ERR_PACK(0, 0, GOST_R_INVALID_BUFFER_SIZE), "invalid buffer size"},
     {ERR_PACK(0, 0, GOST_R_INVALID_CIPHER), "invalid cipher"},
     {ERR_PACK(0, 0, GOST_R_INVALID_CIPHER_PARAMS), "invalid cipher params"},
     {ERR_PACK(0, 0, GOST_R_INVALID_CIPHER_PARAM_OID),
@@ -152,6 +164,7 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
     {ERR_PACK(0, 0, GOST_R_INVALID_MAC_PARAMS), "invalid mac params"},
     {ERR_PACK(0, 0, GOST_R_INVALID_MAC_SIZE), "invalid mac size"},
     {ERR_PACK(0, 0, GOST_R_INVALID_PARAMSET), "invalid paramset"},
+    {ERR_PACK(0, 0, GOST_R_INVALID_TAG_LENGTH), "invalid tag length"},
     {ERR_PACK(0, 0, GOST_R_KEY_IS_NOT_INITIALIZED), "key is not initialized"},
     {ERR_PACK(0, 0, GOST_R_KEY_PARAMETERS_MISSING), "key parameters missing"},
     {ERR_PACK(0, 0, GOST_R_MAC_KEY_NOT_SET), "mac key not set"},
@@ -176,6 +189,7 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
 
 #endif
 
+#ifndef GOST_PROV
 static int lib_code = 0;
 static int error_loaded = 0;
 
@@ -220,3 +234,4 @@ void ERR_GOST_error(int function, int reason, char *file, int line)
     ERR_set_debug(file, line, NULL);
 #endif
 }
+#endif