X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=e693841b08c70dd9bf44c0a661c65e6ecf518b91;hb=748a6c3d85314ce5f8a643dca6e7b19cd7f089c7;hp=032886ff4a0e00b6fef87cd7fe54454c9d631f06;hpb=41b4121253a9c0e8d82d3eebcfe728d5d43e1b51;p=openssl-gost%2Fengine.git

diff --git a/gost_lcl.h b/gost_lcl.h
index 032886f..e693841 100644
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -68,8 +68,8 @@ struct gost_pmeth_data {
     int sign_param_nid;         /* Should be set whenever parameters are
                                  * filled */
     EVP_MD *md;
-    unsigned char *shared_ukm;
-    size_t shared_ukm_size;     /* XXX temporary use shared_ukm and hash for 2018 CKE */
+    unsigned char shared_ukm[32];
+    size_t shared_ukm_size;
     int peer_key_used;
     int cipher_nid;             /* KExp15/KImp15 algs */
 };
@@ -217,7 +217,10 @@ struct ossl_gost_cipher_ctx {
     int paramNID;
     unsigned int count;
     int key_meshing;
+    unsigned char kdf_seed[8];
+    unsigned char tag[8];
     gost_ctx cctx;
+    EVP_MD_CTX *omac_ctx;
 };
 /* Structure to map parameter NID to S-block */
 struct gost_cipher_info {
@@ -247,6 +250,8 @@ const EVP_CIPHER *cipher_gost_cpacnt();
 const EVP_CIPHER *cipher_gost_cpcnt_12();
 const EVP_CIPHER *cipher_magma_cbc();
 const EVP_CIPHER *cipher_magma_ctr();
+const EVP_CIPHER *cipher_magma_ctr_acpkm();
+const EVP_CIPHER *cipher_magma_ctr_acpkm_omac();
 const EVP_CIPHER *cipher_magma_wrap();
 const EVP_CIPHER *cipher_kuznyechik_wrap();
 void cipher_gost_destroy();