From 499aa8754cf2200d7c83dfea16e7602c9c60d673 Mon Sep 17 00:00:00 2001
From: Vitaly Chikunov <vt@altlinux.org>
Date: Tue, 12 May 2020 02:10:07 +0300
Subject: [PATCH] gost_crypt: Add Gost28147_89_cbc_cipher

---
 gost_crypt.c | 70 +++++++++++++---------------------------------------
 gost_eng.c   |  3 ++-
 gost_lcl.h   |  2 +-
 3 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/gost_crypt.c b/gost_crypt.c
index cc9be5e..943d873 100644
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -119,39 +119,23 @@ GOST_cipher Gost28147_89_cipher = {
     .ctrl = gost_cipher_ctl,
 };
 
-static EVP_CIPHER *_hidden_Gost28147_89_cbc = NULL;
-const EVP_CIPHER *cipher_gost_cbc(void)
-{
-    if (_hidden_Gost28147_89_cbc == NULL
-        && ((_hidden_Gost28147_89_cbc =
-             EVP_CIPHER_meth_new(NID_gost89_cbc, 8 /* block_size */ ,
-                                 32 /* key_size */ )) == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_Gost28147_89_cbc, 8)
-            || !EVP_CIPHER_meth_set_flags(_hidden_Gost28147_89_cbc,
-                                          EVP_CIPH_CBC_MODE |
-                                          EVP_CIPH_CUSTOM_IV |
-                                          EVP_CIPH_RAND_KEY |
-                                          EVP_CIPH_ALWAYS_CALL_INIT)
-            || !EVP_CIPHER_meth_set_init(_hidden_Gost28147_89_cbc,
-                                         gost_cipher_init_cbc)
-            || !EVP_CIPHER_meth_set_do_cipher(_hidden_Gost28147_89_cbc,
-                                              gost_cipher_do_cbc)
-            || !EVP_CIPHER_meth_set_cleanup(_hidden_Gost28147_89_cbc,
-                                            gost_cipher_cleanup)
-            || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_Gost28147_89_cbc,
-                                                  sizeof(struct
-                                                         ossl_gost_cipher_ctx))
-            || !EVP_CIPHER_meth_set_set_asn1_params(_hidden_Gost28147_89_cbc,
-                                                    gost89_set_asn1_parameters)
-            || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_Gost28147_89_cbc,
-                                                    gost89_get_asn1_parameters)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_Gost28147_89_cbc,
-                                         gost_cipher_ctl))) {
-        EVP_CIPHER_meth_free(_hidden_Gost28147_89_cbc);
-        _hidden_Gost28147_89_cbc = NULL;
-    }
-    return _hidden_Gost28147_89_cbc;
-}
+GOST_cipher Gost28147_89_cbc_cipher = {
+    .nid = NID_gost89_cbc,
+    .block_size = 8,
+    .key_len = 32,
+    .iv_len = 8,
+    .flags = EVP_CIPH_CBC_MODE |
+        EVP_CIPH_CUSTOM_IV |
+        EVP_CIPH_RAND_KEY |
+        EVP_CIPH_ALWAYS_CALL_INIT,
+    .init = gost_cipher_init_cbc,
+    .do_cipher = gost_cipher_do_cbc,
+    .cleanup = gost_cipher_cleanup,
+    .ctx_size = sizeof(struct ossl_gost_cipher_ctx),
+    .set_asn1_parameters = gost89_set_asn1_parameters,
+    .get_asn1_parameters = gost89_get_asn1_parameters,
+    .ctrl = gost_cipher_ctl,
+};
 
 static EVP_CIPHER *_hidden_gost89_cnt = NULL;
 const EVP_CIPHER *cipher_gost_cpacnt(void)
@@ -353,26 +337,6 @@ const EVP_CIPHER *cipher_magma_cbc(void)
     return _hidden_magma_cbc;
 }
 
-void cipher_gost_destroy(void)
-{
-    //EVP_CIPHER_meth_free(_hidden_Gost28147_89_cipher);
-    //_hidden_Gost28147_89_cipher = NULL;
-    EVP_CIPHER_meth_free(_hidden_gost89_cnt);
-    _hidden_gost89_cnt = NULL;
-    EVP_CIPHER_meth_free(_hidden_Gost28147_89_cbc);
-    _hidden_Gost28147_89_cbc = NULL;
-    EVP_CIPHER_meth_free(_hidden_gost89_cnt_12);
-    _hidden_gost89_cnt_12 = NULL;
-    EVP_CIPHER_meth_free(_hidden_magma_cbc);
-    _hidden_magma_cbc = NULL;
-    EVP_CIPHER_meth_free(_hidden_magma_ctr);
-    _hidden_magma_ctr = NULL;
-    EVP_CIPHER_meth_free(_hidden_magma_ctr_acpkm);
-    _hidden_magma_ctr_acpkm = NULL;
-    EVP_CIPHER_meth_free(_hidden_magma_ctr_acpkm_omac);
-    _hidden_magma_ctr_acpkm_omac = NULL;
-}
-
 /* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */
 /* Init functions which set specific parameters */
 static int gost_imit_init_cpa(EVP_MD_CTX *ctx);
diff --git a/gost_eng.c b/gost_eng.c
index 7997530..9090e72 100644
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -126,7 +126,8 @@ static struct gost_cipher_minfo {
     },
     {
         NID_gost89_cbc,
-        cipher_gost_cbc,
+        NULL,
+	&Gost28147_89_cbc_cipher,
     },
     {
         NID_grasshopper_ecb,
diff --git a/gost_lcl.h b/gost_lcl.h
index 3bb8128..9c2126e 100644
--- 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();
@@ -343,5 +342,6 @@ 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;
 #endif
 /* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */
-- 
2.39.2