Kuznyechik ASN1 parameters parsing

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

diff --git a/gost_grasshopper_cipher.h b/gost_grasshopper_cipher.h
index cc67795d125f0ab41152a349257bb9b3f4701bc8..a0acba4b496f6e948dc5eac8c08218c58e88b36c 100644 (file)
--- a/gost_grasshopper_cipher.h
+++ b/gost_grasshopper_cipher.h
@@ -18,22 +18,19 @@ extern "C" {
 // because of buffers
 typedef struct {
     uint8_t type;
+    grasshopper_key_t master_key;
     grasshopper_key_t key;
     grasshopper_round_keys_t encrypt_round_keys;
     grasshopper_round_keys_t decrypt_round_keys;
     grasshopper_w128_t buffer;
 } gost_grasshopper_cipher_ctx;
 
-typedef struct {
-    gost_grasshopper_cipher_ctx c;
-    grasshopper_w128_t buffer1;
-} gost_grasshopper_cipher_ctx_ofb;
-
 typedef struct {
     gost_grasshopper_cipher_ctx c;
     grasshopper_w128_t partial_buffer;
     unsigned int section_size;  /* After how much bytes mesh the key,
                                   if 0 never mesh and work like plain ctr. */
+    unsigned char kdf_seed[8];
 } gost_grasshopper_cipher_ctx_ctr;
 
 typedef int (* grasshopper_init_cipher_func)(EVP_CIPHER_CTX* ctx, const unsigned char* key, const unsigned char* iv,