X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost.txt;h=f4e936b5c4c4bf484a08cad92b360e4041b22291;hb=refs%2Fheads%2Fmgm_impl;hp=4a515f9ca2dc5afe5f553f2fe1f325f460663beb;hpb=0ee4f8fc839278672e47213549bfb152ad3d2654;p=openssl-gost%2Fengine.git

diff --git a/gost.txt b/gost.txt
index 4a515f9..f4e936b 100644
--- a/gost.txt
+++ b/gost.txt
@@ -1,6 +1,6 @@
-# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -18,11 +18,20 @@ GOST_F_GOST_EC_KEYGEN:108:gost_ec_keygen
 GOST_F_GOST_EC_SIGN:109:gost_ec_sign
 GOST_F_GOST_EC_VERIFY:110:gost_ec_verify
 GOST_F_GOST_GRASSHOPPER_CIPHER_CTL:111:gost_grasshopper_cipher_ctl
+GOST_F_GOST_GRASSHOPPER_CIPHER_DO_MGM:155:gost_grasshopper_cipher_do_mgm
+GOST_F_GOST_GRASSHOPPER_CIPHER_INIT:154:gost_grasshopper_cipher_init
 GOST_F_GOST_GRASSHOPPER_SET_ASN1_PARAMETERS:112:\
 	gost_grasshopper_set_asn1_parameters
 GOST_F_GOST_IMIT_CTRL:113:gost_imit_ctrl
 GOST_F_GOST_IMIT_FINAL:114:gost_imit_final
 GOST_F_GOST_IMIT_UPDATE:115:gost_imit_update
+GOST_F_GOST_KDFTREE2012_256:149:gost_kdftree2012_256
+GOST_F_GOST_KEXP15:143:gost_kexp15
+GOST_F_GOST_KIMP15:148:gost_kimp15
+GOST_F_OMAC_ACPKM_IMIT_CTRL:144:omac_acpkm_imit_ctrl
+GOST_F_OMAC_ACPKM_IMIT_FINAL:145:omac_acpkm_imit_final
+GOST_F_OMAC_ACPKM_IMIT_UPDATE:146:omac_acpkm_imit_update
+GOST_F_OMAC_ACPKM_KEY:147:omac_acpkm_key
 GOST_F_OMAC_IMIT_CTRL:116:omac_imit_ctrl
 GOST_F_OMAC_IMIT_FINAL:117:omac_imit_final
 GOST_F_OMAC_IMIT_UPDATE:118:omac_imit_update
@@ -30,12 +39,16 @@ GOST_F_OMAC_KEY:138:omac_key
 GOST_F_PARAM_COPY_GOST_EC:119:param_copy_gost_ec
 GOST_F_PKEY_GOST2001_PARAMGEN:120:pkey_gost2001_paramgen
 GOST_F_PKEY_GOST2012_PARAMGEN:121:pkey_gost2012_paramgen
+GOST_F_PKEY_GOST2018_DECRYPT:150:pkey_gost2018_decrypt
+GOST_F_PKEY_GOST2018_ENCRYPT:151:pkey_gost2018_encrypt
 GOST_F_PKEY_GOST_CTRL:122:pkey_gost_ctrl
+GOST_F_PKEY_GOST_DECRYPT:153:pkey_gost_decrypt
 GOST_F_PKEY_GOST_ECCP_DECRYPT:123:pkey_GOST_ECcp_decrypt
 GOST_F_PKEY_GOST_ECCP_ENCRYPT:124:pkey_GOST_ECcp_encrypt
 GOST_F_PKEY_GOST_EC_CTRL_STR_256:125:pkey_gost_ec_ctrl_str_256
 GOST_F_PKEY_GOST_EC_CTRL_STR_512:126:pkey_gost_ec_ctrl_str_512
 GOST_F_PKEY_GOST_EC_DERIVE:127:pkey_gost_ec_derive
+GOST_F_PKEY_GOST_ENCRYPT:152:pkey_gost_encrypt
 GOST_F_PKEY_GOST_GRASSHOPPER_MAC_SIGNCTX_INIT:141:\
 	pkey_gost_grasshopper_mac_signctx_init
 GOST_F_PKEY_GOST_MAC_CTRL:128:pkey_gost_mac_ctrl
@@ -54,16 +67,20 @@ GOST_F_VKO_COMPUTE_KEY:137:VKO_compute_key
 
 #Reason codes
 GOST_R_BAD_KEY_PARAMETERS_FORMAT:100:bad key parameters format
+GOST_R_BAD_MAC:133:bad mac
 GOST_R_BAD_ORDER:132:bad order
 GOST_R_BAD_PKEY_PARAMETERS_FORMAT:101:bad pkey parameters format
 GOST_R_CANNOT_PACK_EPHEMERAL_KEY:102:cannot pack ephemeral key
+GOST_R_CANNOT_UNPACK_EPHEMERAL_KEY:136:cannot unpack ephemeral key
 GOST_R_CIPHER_NOT_FOUND:103:cipher not found
 GOST_R_CTRL_CALL_FAILED:104:ctrl call failed
+GOST_R_ERROR_COMPUTING_EXPORT_KEYS:135:error computing export keys
 GOST_R_ERROR_COMPUTING_SHARED_KEY:105:error computing shared key
 GOST_R_ERROR_PARSING_KEY_TRANSPORT_INFO:106:error parsing key transport info
 GOST_R_ERROR_POINT_MUL:107:error point mul
 GOST_R_INCOMPATIBLE_ALGORITHMS:108:incompatible algorithms
 GOST_R_INCOMPATIBLE_PEER_KEY:109:incompatible peer key
+GOST_R_INVALID_CIPHER:134:invalid cipher
 GOST_R_INVALID_CIPHER_PARAMS:110:invalid cipher params
 GOST_R_INVALID_CIPHER_PARAM_OID:111:invalid cipher param oid
 GOST_R_INVALID_DIGEST_TYPE:112:invalid digest type
@@ -73,6 +90,7 @@ GOST_R_INVALID_MAC_KEY_SIZE:115:invalid mac key size
 GOST_R_INVALID_MAC_PARAMS:116:invalid mac params
 GOST_R_INVALID_MAC_SIZE:117:invalid mac size
 GOST_R_INVALID_PARAMSET:118:invalid paramset
+GOST_R_INVALID_TAG_LENGTH:137:invalid tag length
 GOST_R_KEY_IS_NOT_INITIALIZED:119:key is not initialized
 GOST_R_KEY_PARAMETERS_MISSING:120:key parameters missing
 GOST_R_MAC_KEY_NOT_SET:121:mac key not set