X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_eng.c;h=d2371d297640d3f82d53a339a7838f9b1003fc5d;hb=65d9677890ca5eeca45bca0fb09d6cd08238161e;hp=08fc59739101013a1ef3be7a65699e1e5bc0c82b;hpb=12d998acc664965cbf63fe61473539d1e022eeb4;p=openssl-gost%2Fengine.git

diff --git a/gost_eng.c b/gost_eng.c
index 08fc597..d2371d2 100644
--- a/gost_eng.c
+++ b/gost_eng.c
@@ -16,6 +16,7 @@
 #include <openssl/obj_mac.h>
 #include "e_gost_err.h"
 #include "gost_lcl.h"
+#include "gost-engine.h"
 
 #include "gost_grasshopper_cipher.h"
 
@@ -24,6 +25,22 @@ static const char* engine_gost_id = "gost";
 static const char* engine_gost_name =
         "Reference implementation of GOST engine";
 
+const ENGINE_CMD_DEFN gost_cmds[] = {
+    {GOST_CTRL_CRYPT_PARAMS,
+     "CRYPT_PARAMS",
+     "OID of default GOST 28147-89 parameters",
+     ENGINE_CMD_FLAG_STRING},
+    {GOST_CTRL_PBE_PARAMS,
+     "PBE_PARAMS",
+     "Shortname of default digest alg for PBE",
+     ENGINE_CMD_FLAG_STRING},
+    {GOST_CTRL_PK_FORMAT,
+     "GOST_PK_FORMAT",
+     "Private key format params",
+     ENGINE_CMD_FLAG_STRING},
+    {0, NULL, NULL, 0}
+};
+
 /* Symmetric cipher and digest function registrar */
 
 static int gost_ciphers(ENGINE* e, const EVP_CIPHER** cipher,
@@ -39,6 +56,7 @@ static int gost_pkey_asn1_meths(ENGINE* e, EVP_PKEY_ASN1_METHOD** ameth,
                                 const int** nids, int nid);
 
 static EVP_PKEY_METHOD* pmeth_GostR3410_2001 = NULL,
+        * pmeth_GostR3410_2001DH = NULL,
         * pmeth_GostR3410_2012_256 = NULL,
         * pmeth_GostR3410_2012_512 = NULL,
         * pmeth_Gost28147_MAC = NULL, * pmeth_Gost28147_MAC_12 = NULL,
@@ -46,6 +64,7 @@ static EVP_PKEY_METHOD* pmeth_GostR3410_2001 = NULL,
         * pmeth_magma_mac_acpkm = NULL,  * pmeth_grasshopper_mac_acpkm = NULL;
 
 static EVP_PKEY_ASN1_METHOD* ameth_GostR3410_2001 = NULL,
+        * ameth_GostR3410_2001DH = NULL,
         * ameth_GostR3410_2012_256 = NULL,
         * ameth_GostR3410_2012_512 = NULL,
         * ameth_Gost28147_MAC = NULL, * ameth_Gost28147_MAC_12 = NULL,
@@ -97,6 +116,13 @@ static struct gost_meth_minfo {
         "GOST2001",
         "GOST R 34.10-2001",
     },
+    {
+        NID_id_GostR3410_2001DH,
+        &pmeth_GostR3410_2001DH,
+        &ameth_GostR3410_2001DH,
+        "GOST2001 DH",
+        "GOST R 34.10-2001 DH",
+    },
     {
         NID_id_Gost28147_89_MAC,
         &pmeth_Gost28147_MAC,
@@ -165,6 +191,101 @@ static int known_cipher_nids[OSSL_NELEM(gost_cipher_array)];
 /* `- 1' because of terminating zero element */
 static int known_meths_nids[OSSL_NELEM(gost_meth_array) - 1];
 
+/* ENGINE_DIGESTS_PTR callback installed by ENGINE_set_digests */
+static int gost_digests(ENGINE *e, const EVP_MD **digest,
+                        const int **nids, int nid)
+{
+    int i;
+
+    if (!digest) {
+        int *n = known_digest_nids;
+
+        *nids = n;
+        for (i = 0; i < OSSL_NELEM(gost_digest_array); i++)
+            *n++ = gost_digest_array[i]->nid;
+        return i;
+    }
+
+    for (i = 0; i < OSSL_NELEM(gost_digest_array); i++)
+        if (nid == gost_digest_array[i]->nid) {
+            *digest = GOST_init_digest(gost_digest_array[i]);
+            return 1;
+        }
+    *digest = NULL;
+    return 0;
+}
+
+/* ENGINE_CIPHERS_PTR callback installed by ENGINE_set_ciphers */
+static int gost_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
+                        const int **nids, int nid)
+{
+    int i;
+
+    if (!cipher) {
+        int *n = known_cipher_nids;
+
+        *nids = n;
+        for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++)
+            *n++ = gost_cipher_array[i]->nid;
+        return i;
+    }
+
+    for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++)
+        if (nid == gost_cipher_array[i]->nid) {
+            *cipher = GOST_init_cipher(gost_cipher_array[i]);
+            return 1;
+        }
+    *cipher = NULL;
+    return 0;
+}
+
+static int gost_meth_nids(const int **nids)
+{
+    struct gost_meth_minfo *info = gost_meth_array;
+    int *n = known_meths_nids;
+
+    *nids = n;
+    for (; info->nid; info++)
+        *n++ = info->nid;
+    return OSSL_NELEM(known_meths_nids);
+}
+
+/* ENGINE_PKEY_METHS_PTR installed by ENGINE_set_pkey_meths */
+static int gost_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
+                           const int **nids, int nid)
+{
+    struct gost_meth_minfo *info;
+
+    if (!pmeth)
+        return gost_meth_nids(nids);
+
+    for (info = gost_meth_array; info->nid; info++)
+        if (nid == info->nid) {
+            *pmeth = *info->pmeth;
+            return 1;
+        }
+    *pmeth = NULL;
+    return 0;
+}
+
+/* ENGINE_PKEY_ASN1_METHS_PTR installed by ENGINE_set_pkey_asn1_meths */
+static int gost_pkey_asn1_meths(ENGINE *e, EVP_PKEY_ASN1_METHOD **ameth,
+                                const int **nids, int nid)
+{
+    struct gost_meth_minfo *info;
+
+    if (!ameth)
+        return gost_meth_nids(nids);
+
+    for (info = gost_meth_array; info->nid; info++)
+        if (nid == info->nid) {
+            *ameth = *info->ameth;
+            return 1;
+        }
+    *ameth = NULL;
+    return 0;
+}
+
 static int gost_engine_init(ENGINE* e) {
     return 1;
 }
@@ -177,9 +298,9 @@ static int gost_engine_destroy(ENGINE* e) {
     int i;
 
     for (i = 0; i < OSSL_NELEM(gost_digest_array); i++)
-	GOST_deinit_digest(gost_digest_array[i]);
+        GOST_deinit_digest(gost_digest_array[i]);
     for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++)
-	GOST_deinit_cipher(gost_cipher_array[i]);
+        GOST_deinit_cipher(gost_cipher_array[i]);
 
     gost_param_free();
 
@@ -194,14 +315,16 @@ static int gost_engine_destroy(ENGINE* e) {
     return 1;
 }
 
-static int bind_gost(ENGINE* e, const char* id) {
+/*
+ * Following is the glue that populates the ENGINE structure and that
+ * binds it to OpenSSL libraries
+ */
+
+static int populate_gost_engine(ENGINE* e) {
     int ret = 0;
-    if (id != NULL && strcmp(id, engine_gost_id) != 0)
-        return 0;
-    if (ameth_GostR3410_2001) {
-        printf("GOST engine already loaded\n");
+
+    if (e == NULL)
         goto end;
-    }
     if (!ENGINE_set_id(e, engine_gost_id)) {
         printf("ENGINE_set_id failed\n");
         goto end;
@@ -241,6 +364,12 @@ static int bind_gost(ENGINE* e, const char* id) {
         goto end;
     }
 
+    /*
+     * "register" in "register_ameth_gost" and "register_pmeth_gost" is
+     * not registering in an ENGINE sense, where things are hooked into
+     * OpenSSL's library.  "register_ameth_gost" and "register_pmeth_gost"
+     * merely allocate and populate the method structures of this engine.
+     */
     struct gost_meth_minfo *minfo = gost_meth_array;
     for (; minfo->nid; minfo++) {
 
@@ -255,6 +384,14 @@ static int bind_gost(ENGINE* e, const char* id) {
             goto end;
     }
 
+    ret = 1;
+  end:
+    return ret;
+}
+
+static int bind_gost_engine(ENGINE* e) {
+    int ret = 0;
+
     if (!ENGINE_register_ciphers(e)
         || !ENGINE_register_digests(e)
         || !ENGINE_register_pkey_meths(e))
@@ -262,12 +399,12 @@ static int bind_gost(ENGINE* e, const char* id) {
 
     int i;
     for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++) {
-	if (!EVP_add_cipher(GOST_init_cipher(gost_cipher_array[i])))
+        if (!EVP_add_cipher(GOST_init_cipher(gost_cipher_array[i])))
             goto end;
     }
 
     for (i = 0; i < OSSL_NELEM(gost_digest_array); i++) {
-	if (!EVP_add_digest(GOST_init_digest(gost_digest_array[i])))
+        if (!EVP_add_digest(GOST_init_digest(gost_digest_array[i])))
             goto end;
     }
 
@@ -275,133 +412,57 @@ static int bind_gost(ENGINE* e, const char* id) {
 
     ERR_load_GOST_strings();
     ret = 1;
-    end:
+  end:
     return ret;
 }
 
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-IMPLEMENT_DYNAMIC_BIND_FN(bind_gost)
-    IMPLEMENT_DYNAMIC_CHECK_FN()
-#endif                          /* ndef OPENSSL_NO_DYNAMIC_ENGINE */
-
-/* ENGINE_DIGESTS_PTR callback installed by ENGINE_set_digests */
-static int gost_digests(ENGINE *e, const EVP_MD **digest,
-                        const int **nids, int nid)
+static int check_gost_engine(ENGINE* e, const char* id)
 {
-    int i;
-
-    if (!digest) {
-        int *n = known_digest_nids;
-
-        *nids = n;
-        for (i = 0; i < OSSL_NELEM(gost_digest_array); i++)
-            *n++ = gost_digest_array[i]->nid;
-        return i;
-    }
-
-    for (i = 0; i < OSSL_NELEM(gost_digest_array); i++)
-        if (nid == gost_digest_array[i]->nid) {
-	    *digest = GOST_init_digest(gost_digest_array[i]);
-	    return 1;
-        }
-    *digest = NULL;
-    return 0;
-}
-
-/* ENGINE_CIPHERS_PTR callback installed by ENGINE_set_ciphers */
-static int gost_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                        const int **nids, int nid)
-{
-    int i;
-
-    if (!cipher) {
-        int *n = known_cipher_nids;
-
-        *nids = n;
-        for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++)
-            *n++ = gost_cipher_array[i]->nid;
-        return i;
+    if (id != NULL && strcmp(id, engine_gost_id) != 0)
+        return 0;
+    if (ameth_GostR3410_2001) {
+        printf("GOST engine already loaded\n");
+        return 0;
     }
-
-    for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++)
-        if (nid == gost_cipher_array[i]->nid) {
-	    *cipher = GOST_init_cipher(gost_cipher_array[i]);
-	    return 1;
-        }
-    *cipher = NULL;
-    return 0;
-}
-
-static int gost_meth_nids(const int **nids)
-{
-    struct gost_meth_minfo *info = gost_meth_array;
-    int *n = known_meths_nids;
-
-    *nids = n;
-    for (; info->nid; info++)
-        *n++ = info->nid;
-    return OSSL_NELEM(known_meths_nids);
+    return 1;
 }
 
-/* ENGINE_PKEY_METHS_PTR installed by ENGINE_set_pkey_meths */
-static int gost_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
-                           const int **nids, int nid)
+static int make_gost_engine(ENGINE* e, const char* id)
 {
-    struct gost_meth_minfo *info;
-
-    if (!pmeth)
-        return gost_meth_nids(nids);
-
-    for (info = gost_meth_array; info->nid; info++)
-        if (nid == info->nid) {
-            *pmeth = *info->pmeth;
-            return 1;
-        }
-    *pmeth = NULL;
-    return 0;
+    return check_gost_engine(e, id)
+        && populate_gost_engine(e)
+        && bind_gost_engine(e);
 }
 
-/* ENGINE_PKEY_ASN1_METHS_PTR installed by ENGINE_set_pkey_asn1_meths */
-static int gost_pkey_asn1_meths(ENGINE *e, EVP_PKEY_ASN1_METHOD **ameth,
-                                const int **nids, int nid)
-{
-    struct gost_meth_minfo *info;
+#ifndef BUILDING_ENGINE_AS_LIBRARY
 
-    if (!ameth)
-        return gost_meth_nids(nids);
+/*
+ * When building gost-engine as a dynamically loadable module, these two
+ * lines do everything that's needed, and OpenSSL's libcrypto will be able
+ * to call its entry points, v_check and bind_engine.
+ */
 
-    for (info = gost_meth_array; info->nid; info++)
-        if (nid == info->nid) {
-            *ameth = *info->ameth;
-            return 1;
-        }
-    *ameth = NULL;
-    return 0;
-}
+IMPLEMENT_DYNAMIC_BIND_FN(make_gost_engine)
+IMPLEMENT_DYNAMIC_CHECK_FN()
 
-#ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#else
 
-static ENGINE* engine_gost(void) {
-    ENGINE* ret = ENGINE_new();
-    if (!ret)
-        return NULL;
-    if (!bind_gost(ret, engine_gost_id)) {
-        ENGINE_free(ret);
-        return NULL;
-    }
-    return ret;
-}
+/*
+ * When building gost-engine as a shared library, the application that uses
+ * it must manually call ENGINE_load_gost() for it to bind itself into the
+ * libcrypto libraries.
+ */
 
 void ENGINE_load_gost(void) {
     ENGINE* toadd;
-    if (pmeth_GostR3410_2001)
-        return;
-    toadd = engine_gost();
-    if (!toadd)
-        return;
-    ENGINE_add(toadd);
+    int ret = 0;
+
+    if ((toadd = ENGINE_new()) != NULL
+        && (ret = make_gost_engine(toadd, engine_gost_id)) > 0)
+        ENGINE_add(toadd);
     ENGINE_free(toadd);
-    ERR_clear_error();
+    if (ret > 0)
+        ERR_clear_error();
 }
 
 #endif