X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_lcl.h;h=a9cb8b0032b0159517cc9ea1b5129644401ba4a4;hb=a00d42f4dfec8dff2f290cf3074dc25fb6b2e985;hp=e693841b08c70dd9bf44c0a661c65e6ecf518b91;hpb=9cf021b8f3cc7b0f49ecd2f165bd1864903c90d0;p=openssl-gost%2Fengine.git

diff --git a/gost_lcl.h b/gost_lcl.h
index e693841..a9cb8b0 100644
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -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,38 @@ 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;
 #endif
+/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */