gost_grasshopper_cipher: Rework cipher registration

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

diff --git a/gost_lcl.h b/gost_lcl.h
index 3bb8128a3f4a06c9a058413735ebaf224aaf0a75..3aafd9eca47405e281ec8c2dd7e690e9ccddfdc0 100644 (file)
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -244,7 +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_cbc();
 const EVP_CIPHER *cipher_gost_cpacnt();
 const EVP_CIPHER *cipher_gost_cpcnt_12();
 const EVP_CIPHER *cipher_magma_cbc();
@@ -321,6 +320,7 @@ 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) */
@@ -343,5 +343,20 @@ 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;
+
 #endif
 /* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */