X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_eng.c;h=caedf9afe1f2302214faeea6764d18cd2a96ec2a;hb=9c0f7cd74fc568fdd62571c660060be2a93aeab9;hp=33659a5a597ab5a519f80e5b64ab590984762761;hpb=843b2565fba31413f4cfc29cbc08e3e6a863b362;p=openssl-gost%2Fengine.git

diff --git a/gost_eng.c b/gost_eng.c
index 33659a5..caedf9a 100644
--- 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
 };
 
@@ -113,38 +114,39 @@ static int gost_engine_finish(ENGINE* e) {
 }
 
 static int gost_engine_destroy(ENGINE* e) {
-  digest_gost_destroy();
-  digest_gost2012_256_destroy();
-  digest_gost2012_512_destroy();
-
-  imit_gost_cpa_destroy();
-  imit_gost_cp_12_destroy();
-  magma_omac_destroy();
-  grasshopper_omac_destroy();
-
-  cipher_gost_destroy();
-
-  gost_param_free();
-
-  pmeth_GostR3410_2001 = NULL;
-  pmeth_Gost28147_MAC = NULL;
-  pmeth_GostR3410_2012_256 = NULL;
-  pmeth_GostR3410_2012_512 = NULL;
-  pmeth_Gost28147_MAC_12 = NULL;
-  pmeth_magma_mac = NULL;
-  pmeth_grasshopper_mac = NULL;
-
-  ameth_GostR3410_2001 = NULL;
-  ameth_Gost28147_MAC = NULL;
-  ameth_GostR3410_2012_256 = NULL;
-  ameth_GostR3410_2012_512 = NULL;
-  ameth_Gost28147_MAC_12 = NULL;
-  ameth_magma_mac = NULL;
-  ameth_grasshopper_mac = NULL;
-
-  ERR_unload_GOST_strings();
-
-  return 1;
+    digest_gost_destroy();
+    digest_gost2012_256_destroy();
+    digest_gost2012_512_destroy();
+
+    imit_gost_cpa_destroy();
+    imit_gost_cp_12_destroy();
+    magma_omac_destroy();
+    grasshopper_omac_destroy();
+
+    cipher_gost_destroy();
+    cipher_gost_grasshopper_destroy();
+
+    gost_param_free();
+
+    pmeth_GostR3410_2001 = NULL;
+    pmeth_Gost28147_MAC = NULL;
+    pmeth_GostR3410_2012_256 = NULL;
+    pmeth_GostR3410_2012_512 = NULL;
+    pmeth_Gost28147_MAC_12 = NULL;
+    pmeth_magma_mac = NULL;
+    pmeth_grasshopper_mac = NULL;
+
+    ameth_GostR3410_2001 = NULL;
+    ameth_Gost28147_MAC = NULL;
+    ameth_GostR3410_2012_256 = NULL;
+    ameth_GostR3410_2012_512 = NULL;
+    ameth_Gost28147_MAC_12 = NULL;
+    ameth_magma_mac = NULL;
+    ameth_grasshopper_mac = NULL;
+
+	ERR_unload_GOST_strings();
+	
+    return 1;
 }
 
 static int bind_gost(ENGINE* e, const char* id) {
@@ -252,6 +254,7 @@ 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())
@@ -331,6 +334,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;