X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=e_gost_err.c;h=ed08b9eb84ec0e829bd623e89a8e62b00c2dcf70;hb=fd5447e7fca18868178b225de76b49bf3dce90c6;hp=9089c4ba5690b5717c35f38051a2a7cdba60cd9f;hpb=debbfa1ae38f18ea06750514dd950775ad9889d8;p=openssl-gost%2Fengine.git

diff --git a/e_gost_err.c b/e_gost_err.c
index 9089c4b..ed08b9e 100644
--- a/e_gost_err.c
+++ b/e_gost_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -20,41 +20,78 @@ static ERR_STRING_DATA GOST_str_functs[] = {
      "encode_gost_algor_params"},
     {ERR_PACK(0, GOST_F_FILL_GOST_EC_PARAMS, 0), "fill_GOST_EC_params"},
     {ERR_PACK(0, GOST_F_GET_ENCRYPTION_PARAMS, 0), "get_encryption_params"},
+    {ERR_PACK(0, GOST_F_GOST2015_GET_ASN1_PARAMS, 0),
+     "gost2015_get_asn1_params"},
+    {ERR_PACK(0, GOST_F_GOST2015_SET_ASN1_PARAMS, 0),
+     "gost2015_set_asn1_params"},
     {ERR_PACK(0, GOST_F_GOST89_GET_ASN1_PARAMETERS, 0),
      "gost89_get_asn1_parameters"},
     {ERR_PACK(0, GOST_F_GOST89_SET_ASN1_PARAMETERS, 0),
      "gost89_set_asn1_parameters"},
     {ERR_PACK(0, GOST_F_GOST_CIPHER_CTL, 0), "gost_cipher_ctl"},
+    {ERR_PACK(0, GOST_F_GOST_CMS_SET_KARI_SHARED_INFO, 0),
+     "gost_cms_set_kari_shared_info"},
+    {ERR_PACK(0, GOST_F_GOST_CMS_SET_KTRI_SHARED_INFO, 0),
+     "gost_cms_set_ktri_shared_info"},
+    {ERR_PACK(0, GOST_F_GOST_CMS_SET_SHARED_INFO, 0),
+     "gost_cms_set_shared_info"},
     {ERR_PACK(0, GOST_F_GOST_EC_COMPUTE_PUBLIC, 0), "gost_ec_compute_public"},
     {ERR_PACK(0, GOST_F_GOST_EC_KEYGEN, 0), "gost_ec_keygen"},
     {ERR_PACK(0, GOST_F_GOST_EC_SIGN, 0), "gost_ec_sign"},
     {ERR_PACK(0, GOST_F_GOST_EC_VERIFY, 0), "gost_ec_verify"},
+    {ERR_PACK(0, GOST_F_GOST_ENCODE_CMS_PARAMS, 0), "gost_encode_cms_params"},
     {ERR_PACK(0, GOST_F_GOST_GRASSHOPPER_CIPHER_CTL, 0),
      "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_SET_ASN1_PARAMETERS, 0),
      "gost_grasshopper_set_asn1_parameters"},
     {ERR_PACK(0, GOST_F_GOST_IMIT_CTRL, 0), "gost_imit_ctrl"},
     {ERR_PACK(0, GOST_F_GOST_IMIT_FINAL, 0), "gost_imit_final"},
     {ERR_PACK(0, GOST_F_GOST_IMIT_UPDATE, 0), "gost_imit_update"},
-    {ERR_PACK(0, GOST_F_MAGMA_IMIT_FINAL, 0), "magma_imit_final"},
-    {ERR_PACK(0, GOST_F_MAGMA_IMIT_UPDATE, 0), "magma_imit_update"},
+    {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_MAGMA_CIPHER_CTL, 0), "magma_cipher_ctl"},
+    {ERR_PACK(0, GOST_F_MAGMA_CIPHER_CTL_ACPKM_OMAC, 0),
+     "magma_cipher_ctl_acpkm_omac"},
+    {ERR_PACK(0, GOST_F_OMAC_ACPKM_IMIT_CTRL, 0), "omac_acpkm_imit_ctrl"},
+    {ERR_PACK(0, GOST_F_OMAC_ACPKM_IMIT_FINAL, 0), "omac_acpkm_imit_final"},
+    {ERR_PACK(0, GOST_F_OMAC_ACPKM_IMIT_UPDATE, 0), "omac_acpkm_imit_update"},
+    {ERR_PACK(0, GOST_F_OMAC_ACPKM_KEY, 0), "omac_acpkm_key"},
+    {ERR_PACK(0, GOST_F_OMAC_IMIT_CTRL, 0), "omac_imit_ctrl"},
+    {ERR_PACK(0, GOST_F_OMAC_IMIT_FINAL, 0), "omac_imit_final"},
+    {ERR_PACK(0, GOST_F_OMAC_IMIT_UPDATE, 0), "omac_imit_update"},
+    {ERR_PACK(0, GOST_F_OMAC_KEY, 0), "omac_key"},
     {ERR_PACK(0, GOST_F_PARAM_COPY_GOST_EC, 0), "param_copy_gost_ec"},
     {ERR_PACK(0, GOST_F_PKEY_GOST2001_PARAMGEN, 0), "pkey_gost2001_paramgen"},
     {ERR_PACK(0, GOST_F_PKEY_GOST2012_PARAMGEN, 0), "pkey_gost2012_paramgen"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST2018_DECRYPT, 0), "pkey_gost2018_decrypt"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST2018_ENCRYPT, 0), "pkey_gost2018_encrypt"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_CTRL, 0), "pkey_gost_ctrl"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_DECRYPT, 0), "pkey_gost_decrypt"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_ECCP_DECRYPT, 0), "pkey_GOST_ECcp_decrypt"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_ECCP_ENCRYPT, 0), "pkey_GOST_ECcp_encrypt"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_EC_CTRL_STR_256, 0),
      "pkey_gost_ec_ctrl_str_256"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_EC_CTRL_STR_512, 0),
      "pkey_gost_ec_ctrl_str_512"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_EC_CTRL_STR_COMMON, 0),
+     "pkey_gost_ec_ctrl_str_common"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_EC_DERIVE, 0), "pkey_gost_ec_derive"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_ENCRYPT, 0), "pkey_gost_encrypt"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_GRASSHOPPER_MAC_SIGNCTX_INIT, 0),
+     "pkey_gost_grasshopper_mac_signctx_init"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_MAC_CTRL, 0), "pkey_gost_mac_ctrl"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_MAC_CTRL_STR, 0), "pkey_gost_mac_ctrl_str"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_MAC_KEYGEN_BASE, 0),
      "pkey_gost_mac_keygen_base"},
     {ERR_PACK(0, GOST_F_PKEY_GOST_MAC_SIGNCTX_INIT, 0),
      "pkey_gost_mac_signctx_init"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_MAGMA_MAC_SIGNCTX_INIT, 0),
+     "pkey_gost_magma_mac_signctx_init"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_OMAC_CTRL, 0), "pkey_gost_omac_ctrl"},
+    {ERR_PACK(0, GOST_F_PKEY_GOST_OMAC_CTRL_STR, 0), "pkey_gost_omac_ctrl_str"},
     {ERR_PACK(0, GOST_F_PRINT_GOST_EC_PUB, 0), "print_gost_ec_pub"},
     {ERR_PACK(0, GOST_F_PRIV_DECODE_GOST, 0), "priv_decode_gost"},
     {ERR_PACK(0, GOST_F_PUB_DECODE_GOST_EC, 0), "pub_decode_gost_ec"},
@@ -67,18 +104,29 @@ static ERR_STRING_DATA GOST_str_functs[] = {
 static ERR_STRING_DATA GOST_str_reasons[] = {
     {ERR_PACK(0, 0, GOST_R_BAD_KEY_PARAMETERS_FORMAT),
     "bad key parameters format"},
+    {ERR_PACK(0, 0, GOST_R_BAD_MAC), "bad mac"},
+    {ERR_PACK(0, 0, GOST_R_BAD_ORDER), "bad order"},
     {ERR_PACK(0, 0, GOST_R_BAD_PKEY_PARAMETERS_FORMAT),
     "bad pkey parameters format"},
     {ERR_PACK(0, 0, GOST_R_CANNOT_PACK_EPHEMERAL_KEY),
     "cannot pack ephemeral key"},
+    {ERR_PACK(0, 0, GOST_R_CANNOT_UNPACK_EPHEMERAL_KEY),
+    "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_ERROR_COMPUTING_EXPORT_KEYS),
+    "error computing export keys"},
     {ERR_PACK(0, 0, GOST_R_ERROR_COMPUTING_SHARED_KEY),
     "error computing shared key"},
+    {ERR_PACK(0, 0, GOST_R_ERROR_DECODING_PUBLIC_KEY),
+    "error decoding public key"},
     {ERR_PACK(0, 0, GOST_R_ERROR_PARSING_KEY_TRANSPORT_INFO),
     "error parsing key transport info"},
     {ERR_PACK(0, 0, GOST_R_ERROR_POINT_MUL), "error point mul"},
+    {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_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),
     "invalid cipher param oid"},
@@ -106,6 +154,8 @@ static ERR_STRING_DATA GOST_str_reasons[] = {
     "unsupported cipher ctl command"},
     {ERR_PACK(0, 0, GOST_R_UNSUPPORTED_PARAMETER_SET),
     "unsupported parameter set"},
+    {ERR_PACK(0, 0, GOST_R_UNSUPPORTED_RECIPIENT_INFO),
+    "unsupported recipient info"},
     {0, NULL}
 };