gost_grasshopper_cipher: Rework cipher registration

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

diff --git a/gost_eng.c b/gost_eng.c
index 84c0937235b1afd7ee4ff3bf8f0e7c30c7e8df0a..09fc4b27c2b9500b2a3eb62f9a11a781bebb8c8c 100644 (file)
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -133,23 +133,28 @@ 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,
@@ -172,12 +177,14 @@ 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,