X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost.txt;h=e57c0006fb574a169f565d664bf005c98cff1f38;hb=7e78d8dc6bbdbc28dff29ec506244f6cc93410b8;hp=3f3ffcd3c85e714d9dc717c4597d9267c1b6c260;hpb=3b27d50d79a9e7bdf3a98910c951c323ce41d6d5;p=openssl-gost%2Fengine.git

diff --git a/gost.txt b/gost.txt
index 3f3ffcd..e57c000 100644
--- a/gost.txt
+++ b/gost.txt
@@ -1,6 +1,6 @@
-# Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2020 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
@@ -37,12 +37,17 @@ 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_CTRL_STR_COMMON:154:
 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
@@ -65,8 +70,10 @@ 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