X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_eng.c;h=e9751e029a61b016aa314176939efeb652142d74;hb=286a33984c698f2efa98dd06995c7d734569409c;hp=9df6a74da9ad420c6e0f06189a56be2d012946bd;hpb=57d07eb0dc22bee10aebb0bd37cbdf2258413564;p=openssl-gost%2Fengine.git

diff --git a/gost_eng.c b/gost_eng.c
index 9df6a74..e9751e0 100644
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -37,17 +37,34 @@ static int gost_cipher_nids[] = {
     NID_id_Gost28147_89,
     NID_gost89_cnt,
     NID_gost89_cnt_12,
+    NID_gost89_cbc,
     0
 };
 
-static int gost_digest_nids[] = {
-    NID_id_GostR3411_94,
-    NID_id_Gost28147_89_MAC,
-    NID_id_GostR3411_2012_256,
-    NID_id_GostR3411_2012_512,
-    NID_gost_mac_12,
-    0
-};
+static int gost_digest_nids(const int **nids)
+{
+    static int digest_nids[6] = { 0, 0, 0, 0, 0, 0 };
+    static int pos = 0;
+    static int init = 0;
+
+    if (!init) {
+        const EVP_MD *md;
+        if ((md = digest_gost()) != NULL)
+            digest_nids[pos++] = EVP_MD_type(md);
+        if ((md = imit_gost_cpa()) != NULL)
+            digest_nids[pos++] = EVP_MD_type(md);
+        if ((md = digest_gost2012_256()) != NULL)
+            digest_nids[pos++] = EVP_MD_type(md);
+        if ((md = digest_gost2012_512()) != NULL)
+            digest_nids[pos++] = EVP_MD_type(md);
+        if ((md = imit_gost_cp_12()) != NULL)
+            digest_nids[pos++] = EVP_MD_type(md);
+        digest_nids[pos] = 0;
+        init = 1;
+    }
+    *nids = digest_nids;
+    return pos;
+}
 
 static int gost_pkey_meth_nids[] = {
     NID_id_GostR3410_2001,
@@ -61,14 +78,12 @@ static int gost_pkey_meth_nids[] = {
 static EVP_PKEY_METHOD *pmeth_GostR3410_2001 = NULL,
     *pmeth_GostR3410_2012_256 = NULL,
     *pmeth_GostR3410_2012_512 = NULL,
-    *pmeth_Gost28147_MAC = NULL,
-    *pmeth_Gost28147_MAC_12 = NULL;
+    *pmeth_Gost28147_MAC = NULL, *pmeth_Gost28147_MAC_12 = NULL;
 
 static EVP_PKEY_ASN1_METHOD *ameth_GostR3410_2001 = NULL,
     *ameth_GostR3410_2012_256 = NULL,
     *ameth_GostR3410_2012_512 = NULL,
-    *ameth_Gost28147_MAC = NULL,
-    *ameth_Gost28147_MAC_12 = NULL;
+    *ameth_Gost28147_MAC = NULL, *ameth_Gost28147_MAC_12 = NULL;
 
 static int gost_engine_init(ENGINE *e)
 {
@@ -82,6 +97,15 @@ 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();
+
+    cipher_gost_destroy();
+
     gost_param_free();
 
     pmeth_GostR3410_2001 = NULL;
@@ -185,14 +209,15 @@ static int bind_gost(ENGINE *e, const char *id)
         || !ENGINE_register_digests(e)
         || !ENGINE_register_pkey_meths(e)
         /* These two actually should go in LIST_ADD command */
-        || !EVP_add_cipher(&cipher_gost)
-        || !EVP_add_cipher(&cipher_gost_cpacnt)
-        || !EVP_add_cipher(&cipher_gost_cpcnt_12)
-        || !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_cipher(cipher_gost())
+        || !EVP_add_cipher(cipher_gost_cbc())
+        || !EVP_add_cipher(cipher_gost_cpacnt())
+        || !EVP_add_cipher(cipher_gost_cpcnt_12())
+        || !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())
         ) {
         goto end;
     }
@@ -212,19 +237,18 @@ static int gost_digests(ENGINE *e, const EVP_MD **digest,
 {
     int ok = 1;
     if (!digest) {
-        *nids = gost_digest_nids;
-        return 5;
+        return gost_digest_nids(nids);
     }
     if (nid == NID_id_GostR3411_94) {
-        *digest = &digest_gost;
+        *digest = digest_gost();
+    } else if (nid == NID_id_Gost28147_89_MAC) {
+        *digest = imit_gost_cpa();
     } else if (nid == NID_id_GostR3411_2012_256) {
-        *digest = &digest_gost2012_256;
+        *digest = digest_gost2012_256();
     } else if (nid == NID_id_GostR3411_2012_512) {
-        *digest = &digest_gost2012_512;
-    } else if (nid == NID_id_Gost28147_89_MAC) {
-        *digest = &imit_gost_cpa;
+        *digest = digest_gost2012_512();
     } else if (nid == NID_gost_mac_12) {
-        *digest = &imit_gost_cp_12;
+        *digest = imit_gost_cp_12();
     } else {
         ok = 0;
         *digest = NULL;
@@ -238,15 +262,17 @@ static int gost_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
     int ok = 1;
     if (!cipher) {
         *nids = gost_cipher_nids;
-        return 3;               /* three ciphers are supported */
+        return sizeof(gost_cipher_nids) / sizeof(gost_cipher_nids[0]) - 1;
     }
 
     if (nid == NID_id_Gost28147_89) {
-        *cipher = &cipher_gost;
+        *cipher = cipher_gost();
     } else if (nid == NID_gost89_cnt) {
-        *cipher = &cipher_gost_cpacnt;
+        *cipher = cipher_gost_cpacnt();
     } else if (nid == NID_gost89_cnt_12) {
-        *cipher = &cipher_gost_cpcnt_12;
+        *cipher = cipher_gost_cpcnt_12();
+    } else if (nid == NID_gost89_cbc) {
+        *cipher = cipher_gost_cbc();
     } else {
         ok = 0;
         *cipher = NULL;
@@ -259,7 +285,8 @@ static int gost_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
 {
     if (!pmeth) {
         *nids = gost_pkey_meth_nids;
-        return sizeof(gost_pkey_meth_nids)/sizeof(int) - 1;
+        return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) -
+            1;
     }
 
     switch (nid) {
@@ -291,7 +318,8 @@ static int gost_pkey_asn1_meths(ENGINE *e, EVP_PKEY_ASN1_METHOD **ameth,
 {
     if (!ameth) {
         *nids = gost_pkey_meth_nids;
-        return sizeof(gost_pkey_meth_nids)/sizeof(int) - 1;
+        return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) -
+            1;
     }
     switch (nid) {
     case NID_id_GostR3410_2001: