Explicitely setting cofactor

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

diff --git a/gost_eng.c b/gost_eng.c
index 0cef2faf00320f1edf20cbfc7efba370f667502b..1f2565400bfce17c944ede17d6b2922ce231f300 100644 (file)
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -48,6 +48,7 @@ static int gost_cipher_nids[] = {
         NID_grasshopper_ofb,
         NID_grasshopper_ctr,
         NID_magma_cbc,
+        NID_magma_ctr,
         0
 };
 
@@ -214,10 +215,10 @@ static int bind_gost(ENGINE* e, const char* id) {
                              "GOST 28147-89 MAC with 2012 params"))
         goto end;
     if (!register_ameth_gost(NID_magma_mac, &ameth_magma_mac,
-                             "MAGMA-OMAC", "GOST R 34.13-2015 Magma MAC"))
+                             "MAGMA-MAC", "GOST R 34.13-2015 Magma MAC"))
         goto end;
     if (!register_ameth_gost(NID_grasshopper_mac, &ameth_grasshopper_mac,
-                             "GRASSHOPPER-OMAC", "GOST R 34.13-2015 Grasshopper MAC"))
+                             "GRASSHOPPER-MAC", "GOST R 34.13-2015 Grasshopper MAC"))
         goto end;
 
     if (!register_pmeth_gost(NID_id_GostR3410_2001, &pmeth_GostR3410_2001, 0))
@@ -252,11 +253,14 @@ static int bind_gost(ENGINE* e, const char* id) {
         || !EVP_add_cipher(cipher_gost_grasshopper_ofb())
         || !EVP_add_cipher(cipher_gost_grasshopper_ctr())
         || !EVP_add_cipher(cipher_magma_cbc())
+        || !EVP_add_cipher(cipher_magma_ctr())
         || !EVP_add_digest(digest_gost())
         || !EVP_add_digest(digest_gost2012_512())
         || !EVP_add_digest(digest_gost2012_256())
         || !EVP_add_digest(imit_gost_cpa())
         || !EVP_add_digest(imit_gost_cp_12())
+        || !EVP_add_digest(magma_omac())
+        || !EVP_add_digest(grasshopper_omac())
             ) {
         goto end;
     }
@@ -329,6 +333,8 @@ static int gost_ciphers(ENGINE* e, const EVP_CIPHER** cipher,
         *cipher = cipher_gost_grasshopper_ctr();
     } else if (nid == NID_magma_cbc) {
         *cipher = cipher_magma_cbc();
+    } else if (nid == NID_magma_ctr) {
+        *cipher = cipher_magma_ctr();
     } else {
         ok = 0;
         *cipher = NULL;