]> wagner.pp.ru Git - openssl-gost/engine.git/blobdiff - gost_eng.c
Allow skipping perl tests
[openssl-gost/engine.git] / gost_eng.c
index 8257072a3c8637d94fa9c3282cc398201a1f872a..78e609f861c839e4ea73b64631cee2087a4efd25 100644 (file)
@@ -154,10 +154,30 @@ static struct gost_cipher_minfo {
         NID_magma_ctr,
         cipher_magma_ctr,
     },
+    {
+        NID_magma_ctr_acpkm,
+        cipher_magma_ctr_acpkm,
+    },
+    {
+        NID_magma_ctr_acpkm_omac,
+        cipher_magma_ctr_acpkm_omac,
+    },
     {
         NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm,
         cipher_gost_grasshopper_ctracpkm,
     },
+    {
+        NID_kuznyechik_ctr_acpkm_omac,
+        cipher_gost_grasshopper_ctracpkm_omac,
+    },
+    {
+        NID_magma_kexp15,
+        cipher_magma_wrap,
+    },
+    {
+        NID_kuznyechik_kexp15,
+        cipher_kuznyechik_wrap,
+    },
     { 0 },
 };
 
@@ -214,7 +234,7 @@ static struct gost_meth_minfo {
         NID_grasshopper_mac,
         &pmeth_grasshopper_mac,
         &ameth_grasshopper_mac,
-        "GRASSHOPPER-MAC",
+        "KUZNYECHIK-MAC",
         "GOST R 34.13-2015 Grasshopper MAC",
     },
     {
@@ -261,6 +281,7 @@ static int gost_engine_destroy(ENGINE* e) {
 
     cipher_gost_destroy();
     cipher_gost_grasshopper_destroy();
+    wrap_ciphers_destroy();
 
     gost_param_free();