Bugfix + some basic test setup

[openssl-gost/engine.git] / gost_lcl.h

diff --git a/gost_lcl.h b/gost_lcl.h
index 75d59b78b7b1c55624c5d56935166f7c60dd6622..7871eb8b73b21ad9d389227f95a559924b12a801 100644 (file)
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -9,7 +9,6 @@
  *         OpenSSL 0.9.9 libraries required to compile and use        *
  *                              this code                             *
  **********************************************************************/
-# include "compat.h"
 # include <openssl/bn.h>
 # include <openssl/evp.h>
 # include <openssl/dsa.h>
@@ -70,7 +69,9 @@ struct gost_pmeth_data {
                                  * filled */
     EVP_MD *md;
     unsigned char *shared_ukm;
+    size_t shared_ukm_size; /* XXX temporary use shared_ukm and hash for 2018 CKE*/
     int peer_key_used;
+    int cipher_nid; /* KExp15/KImp15 algs*/
 };
 
 struct gost_mac_pmeth_data {
@@ -183,7 +184,9 @@ void imit_gost_cp_12_destroy(void);
 EVP_MD *magma_omac(void);
 void magma_omac_destroy(void);
 EVP_MD *grasshopper_omac(void);
+EVP_MD *grasshopper_omac_acpkm(void);
 void grasshopper_omac_destroy(void);
+void grasshopper_omac_acpkm_destroy(void);
 /* Cipher context used for EVP_CIPHER operation */
 struct ossl_gost_cipher_ctx {
     int paramNID;