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

diff --git a/gost_eng.c b/gost_eng.c
index 9df6a74..097563e 100644
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -37,6 +37,7 @@ static int gost_cipher_nids[] = {
     NID_id_Gost28147_89,
     NID_gost89_cnt,
     NID_gost89_cnt_12,
+    NID_gost89_cbc,
     0
 };
 
@@ -61,14 +62,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)
 {
@@ -186,6 +185,7 @@ static int bind_gost(ENGINE *e, const char *id)
         || !ENGINE_register_pkey_meths(e)
         /* These two actually should go in LIST_ADD command */
         || !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)
@@ -213,7 +213,7 @@ static int gost_digests(ENGINE *e, const EVP_MD **digest,
     int ok = 1;
     if (!digest) {
         *nids = gost_digest_nids;
-        return 5;
+        return sizeof(gost_digest_nids) / sizeof(gost_digest_nids[0]) - 1;
     }
     if (nid == NID_id_GostR3411_94) {
         *digest = &digest_gost;
@@ -238,7 +238,7 @@ 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) {
@@ -247,6 +247,8 @@ static int gost_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
         *cipher = &cipher_gost_cpacnt;
     } else if (nid == NID_gost89_cnt_12) {
         *cipher = &cipher_gost_cpcnt_12;
+    } else if (nid == NID_gost89_cbc) {
+        *cipher = &cipher_gost_cbc;
     } else {
         ok = 0;
         *cipher = NULL;
@@ -259,7 +261,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 +294,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: