X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=d2d2e79273eac49e7472a821761a663169031500;hb=ea281d2516111f018f224409098d5a1d11e967bd;hp=8af52cea6e086de7d7463b2a5f0c2e8765db9fd7;hpb=ada25f9709c9ee9ea330b25e5a749101532d8825;p=openssl-gost%2Fengine.git

diff --git a/gost_lcl.h b/gost_lcl.h
index 8af52ce..d2d2e79 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 */
 };
@@ -244,8 +244,6 @@ extern struct gost_cipher_info gost_cipher_list[];
 /* Find encryption params from ASN1_OBJECT */
 const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj);
 /* Implementation of GOST 28147-89 cipher in CFB and CNT modes */
-const EVP_CIPHER *cipher_gost();
-const EVP_CIPHER *cipher_gost_cbc();
 const EVP_CIPHER *cipher_gost_cpacnt();
 const EVP_CIPHER *cipher_gost_cpcnt_12();
 const EVP_CIPHER *cipher_magma_cbc();
@@ -319,4 +317,70 @@ int pack_sign_cp(ECDSA_SIG *s, int order, unsigned char *sig, size_t *siglen);
 /* Get private key as BIGNUM from both 34.10-2001 keys*/
 /* Returns pointer into EVP_PKEY structure */
 BIGNUM *gost_get0_priv_key(const EVP_PKEY *pkey);
+
+/* Struct describing cipher and used for init/deinit.*/
+struct gost_cipher_st {
+    struct gost_cipher_st *template; /* template struct */
+    int nid;
+    EVP_CIPHER *cipher;
+    int block_size;     /* (bytes) */
+    int key_len;        /* (bytes) */
+    int iv_len;
+    int flags;
+    int (*init) (EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                 const unsigned char *iv, int enc);
+    int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                     const unsigned char *in, size_t inl);
+    int (*cleanup)(EVP_CIPHER_CTX *);
+    int ctx_size;
+    int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *);
+    int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *);
+    int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
+};
+typedef struct gost_cipher_st GOST_cipher;
+
+EVP_CIPHER *GOST_init_cipher(GOST_cipher *c);
+void GOST_deinit_cipher(GOST_cipher *c);
+
+extern GOST_cipher Gost28147_89_cipher;
+extern GOST_cipher Gost28147_89_cbc_cipher;
+extern GOST_cipher Gost28147_89_cnt_cipher;
+extern GOST_cipher Gost28147_89_cnt_12_cipher;
+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 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_ctr_acpkm_cipher;
+extern GOST_cipher grasshopper_ctr_acpkm_omac_cipher;
+extern GOST_cipher magma_kexp15_cipher;
+extern GOST_cipher kuznyechik_kexp15_cipher;
+
+struct gost_digest_st {
+    struct gost_digest_st *template;
+    int nid;
+    EVP_MD *digest;
+    int result_size;
+    int input_blocksize;
+    int app_datasize;
+    int flags;
+    int (*init)(EVP_MD_CTX *ctx);
+    int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
+    int (*final)(EVP_MD_CTX *ctx, unsigned char *md);
+    int (*copy)(EVP_MD_CTX *to, const EVP_MD_CTX *from);
+    int (*cleanup)(EVP_MD_CTX *ctx);
+    int (*ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
+};
+typedef struct gost_digest_st GOST_digest;
+
+EVP_MD *GOST_init_digest(GOST_digest *d);
+void GOST_deinit_digest(GOST_digest *d);
+
+extern GOST_digest GostR3411_94_digest;
+
 #endif
+/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */