gost_keyexpimp: Rework cipher registration

[openssl-gost/engine.git] / gost_eng.c

diff --git a/gost_eng.c b/gost_eng.c
index 1154701f5974a6aee5e20a2276850bf402a32140..a095982afb96e9ad1dfc313d32300915cd10ab92 100644 (file)
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -133,27 +133,33 @@ static struct gost_cipher_minfo {
     },
     {
         NID_grasshopper_ecb,
-        cipher_gost_grasshopper_ecb,
+        NULL,
+       &grasshopper_ecb_cipher,
     },
     {
         NID_grasshopper_cbc,
-        cipher_gost_grasshopper_cbc,
+        NULL,
+       &grasshopper_cbc_cipher,
     },
     {
         NID_grasshopper_cfb,
-        cipher_gost_grasshopper_cfb,
+        NULL,
+       &grasshopper_cfb_cipher,
     },
     {
         NID_grasshopper_ofb,
-        cipher_gost_grasshopper_ofb,
+        NULL,
+       &grasshopper_ofb_cipher,
     },
     {
         NID_grasshopper_ctr,
-        cipher_gost_grasshopper_ctr,
+        NULL,
+       &grasshopper_ctr_cipher,
     },
     {
         NID_magma_cbc,
-        cipher_magma_cbc,
+        NULL,
+       &magma_cbc_cipher,
     },
     {
         NID_magma_ctr,
@@ -171,20 +177,24 @@ static struct gost_cipher_minfo {
        &magma_ctr_acpkm_omac_cipher,
     },
     {
-        NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm,
-        cipher_gost_grasshopper_ctracpkm,
+        NID_kuznyechik_ctr_acpkm,
+        NULL,
+       &grasshopper_ctr_acpkm_cipher,
     },
     {
         NID_kuznyechik_ctr_acpkm_omac,
-        cipher_gost_grasshopper_ctracpkm_omac,
+        NULL,
+       &grasshopper_ctr_acpkm_omac_cipher,
     },
     {
         NID_magma_kexp15,
-        cipher_magma_wrap,
+        NULL,
+       &magma_kexp15_cipher,
     },
     {
         NID_kuznyechik_kexp15,
-        cipher_kuznyechik_wrap,
+        NULL,
+       &kuznyechik_kexp15_cipher
     },
     { 0 },
 };