X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=afa19ebb7bc708a5a21d6d8efb21307d1dc02103;hb=b441d92094fd48d564bae043c0db3d5c84a504fd;hp=c60d8d2bf0a763cacd88fab256e0e656fc22d0f8;hpb=bc346202fbb3bc838a19af8c3b0e449926589c7b;p=openssl-gost%2Fengine.git diff --git a/gost_lcl.h b/gost_lcl.h index c60d8d2..afa19eb 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -57,6 +57,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth, int flags); /* For GOST R34.10 parameters */ # define param_ctrl_string "paramset" # define ukm_ctrl_string "ukmhex" +# define vko_ctrl_string "vko" # define EVP_PKEY_CTRL_GOST_PARAMSET (EVP_PKEY_ALG_CTRL+1) /* For GOST 28147 MAC */ # define key_ctrl_string "key" @@ -64,6 +65,7 @@ int register_pmeth_gost(int id, EVP_PKEY_METHOD **pmeth, int flags); # define maclen_ctrl_string "size" # define EVP_PKEY_CTRL_GOST_MAC_HEXKEY (EVP_PKEY_ALG_CTRL+3) # define EVP_PKEY_CTRL_MAC_LEN (EVP_PKEY_ALG_CTRL+5) +# define EVP_PKEY_CTRL_SET_VKO (EVP_PKEY_ALG_CTRL+11) /* Pmeth internal representation */ struct gost_pmeth_data { int sign_param_nid; /* Should be set whenever parameters are @@ -73,6 +75,7 @@ struct gost_pmeth_data { size_t shared_ukm_size; int peer_key_used; int cipher_nid; /* KExp15/KImp15 algs */ + int vko_dgst_nid; }; struct gost_mac_pmeth_data { @@ -335,11 +338,13 @@ extern GOST_cipher magma_ctr_cipher; extern GOST_cipher magma_ctr_acpkm_cipher; extern GOST_cipher magma_ctr_acpkm_omac_cipher; extern GOST_cipher magma_cbc_cipher; +extern GOST_cipher magma_mgm_cipher; extern GOST_cipher grasshopper_ecb_cipher; extern GOST_cipher grasshopper_cbc_cipher; extern GOST_cipher grasshopper_cfb_cipher; extern GOST_cipher grasshopper_ofb_cipher; extern GOST_cipher grasshopper_ctr_cipher; +extern GOST_cipher grasshopper_mgm_cipher; extern GOST_cipher grasshopper_ctr_acpkm_cipher; extern GOST_cipher grasshopper_ctr_acpkm_omac_cipher; extern GOST_cipher magma_kexp15_cipher;