]> www.wagner.pp.ru Git - openssl-gost/engine.git/blobdiff - gost_eng.c
tcl_tests: ca.try: Ignore openssl crl exit status for 'corrupted CRL' test
[openssl-gost/engine.git] / gost_eng.c
index 69f99757c2ae704a324930297ee71eef0502963e..7ca5523721dc8e26121e00c1fdfbd9b4d2896f7f 100644 (file)
@@ -1,11 +1,12 @@
 /**********************************************************************
  *                          gost_eng.c                                *
+ *              Main file of GOST engine                              *
+ *                                                                    *
  *             Copyright (c) 2005-2006 Cryptocom LTD                  *
- *         This file is distributed under the same license as OpenSSL *
+ *             Copyright (c) 2020 Chikunov Vitaly <vt@altlinux.org>   *
+ *                                                                    *
+ *       This file is distributed under the same license as OpenSSL   *
  *                                                                    *
- *              Main file of GOST engine                              *
- *       for OpenSSL                                                  *
- *          Requires OpenSSL 0.9.9 for compilation                    *
  **********************************************************************/
 #include <string.h>
 #include <openssl/crypto.h>
@@ -15,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"
 
@@ -23,13 +25,29 @@ 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,
                         const int** nids, int nid);
 
 static int gost_digests(ENGINE* e, const EVP_MD** digest,
-                        const int** nids, int ind);
+                        const int** nids, int nid);
 
 static int gost_pkey_meths(ENGINE* e, EVP_PKEY_METHOD** pmeth,
                            const int** nids, int nid);
@@ -37,81 +55,239 @@ static int gost_pkey_meths(ENGINE* e, EVP_PKEY_METHOD** pmeth,
 static int gost_pkey_asn1_meths(ENGINE* e, EVP_PKEY_ASN1_METHOD** ameth,
                                 const int** nids, int nid);
 
-static int gost_cipher_nids[] = {
-        NID_id_Gost28147_89,
-        NID_gost89_cnt,
-        NID_gost89_cnt_12,
-        NID_gost89_cbc,
-        NID_grasshopper_ecb,
-        NID_grasshopper_cbc,
-        NID_grasshopper_cfb,
-        NID_grasshopper_ofb,
-        NID_grasshopper_ctr,
-        NID_magma_cbc,
-        NID_magma_ctr,
-        NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm,
-        0
+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,
+        * pmeth_magma_mac = NULL,  * pmeth_grasshopper_mac = 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,
+        * ameth_magma_mac = NULL,  * ameth_grasshopper_mac = NULL,
+        * ameth_magma_mac_acpkm = NULL,  * ameth_grasshopper_mac_acpkm = NULL;
+
+GOST_digest *gost_digest_array[] = {
+    &GostR3411_94_digest,
+    &Gost28147_89_MAC_digest,
+    &GostR3411_2012_256_digest,
+    &GostR3411_2012_512_digest,
+    &Gost28147_89_mac_12_digest,
+    &magma_mac_digest,
+    &grasshopper_mac_digest,
+    &kuznyechik_ctracpkm_omac_digest,
 };
 
-static int gost_digest_nids(const int** nids) {
-    static int digest_nids[10] = {0, 0, 0, 0, 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);
-        if ((md = magma_omac()) != NULL)
-            digest_nids[pos++] = EVP_MD_type(md);
-        if ((md = grasshopper_omac()) != NULL)
-            digest_nids[pos++] = EVP_MD_type(md);
-/*        if ((md = magma_omac_acpkm()) != NULL)
-            digest_nids[pos++] = EVP_MD_type(md);*/
-        if ((md = grasshopper_omac_acpkm()) != NULL)
-            digest_nids[pos++] = EVP_MD_type(md);
-
-        digest_nids[pos] = 0;
-        init = 1;
-    }
-    *nids = digest_nids;
-    return pos;
-}
+GOST_cipher *gost_cipher_array[] = {
+    &Gost28147_89_cipher,
+    &Gost28147_89_cnt_cipher,
+    &Gost28147_89_cnt_12_cipher,
+    &Gost28147_89_cbc_cipher,
+    &grasshopper_ecb_cipher,
+    &grasshopper_cbc_cipher,
+    &grasshopper_cfb_cipher,
+    &grasshopper_ofb_cipher,
+    &grasshopper_ctr_cipher,
+    &magma_ecb_cipher,
+    &grasshopper_mgm_cipher,
+    &magma_cbc_cipher,
+    &magma_ctr_cipher,
+    &magma_ctr_acpkm_cipher,
+    &magma_ctr_acpkm_omac_cipher,
+    &magma_mgm_cipher,
+    &grasshopper_ctr_acpkm_cipher,
+    &grasshopper_ctr_acpkm_omac_cipher,
+    &magma_kexp15_cipher,
+    &kuznyechik_kexp15_cipher,
+};
 
-static int gost_pkey_meth_nids[] = {
+static struct gost_meth_minfo {
+    int nid;
+    EVP_PKEY_METHOD **pmeth;
+    EVP_PKEY_ASN1_METHOD **ameth;
+    const char *pemstr;
+    const char *info;
+} gost_meth_array[] = {
+    {
         NID_id_GostR3410_2001,
+        &pmeth_GostR3410_2001,
+        &ameth_GostR3410_2001,
+        "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,
+        &ameth_Gost28147_MAC,
+        "GOST-MAC",
+        "GOST 28147-89 MAC",
+    },
+    {
         NID_id_GostR3410_2012_256,
+        &pmeth_GostR3410_2012_256,
+        &ameth_GostR3410_2012_256,
+        "GOST2012_256",
+        "GOST R 34.10-2012 with 256 bit key",
+    },
+    {
         NID_id_GostR3410_2012_512,
+        &pmeth_GostR3410_2012_512,
+        &ameth_GostR3410_2012_512,
+        "GOST2012_512",
+        "GOST R 34.10-2012 with 512 bit key",
+    },
+    {
         NID_gost_mac_12,
+        &pmeth_Gost28147_MAC_12,
+        &ameth_Gost28147_MAC_12,
+        "GOST-MAC-12",
+        "GOST 28147-89 MAC with 2012 params",
+    },
+    {
         NID_magma_mac,
+        &pmeth_magma_mac,
+        &ameth_magma_mac,
+        "MAGMA-MAC",
+        "GOST R 34.13-2015 Magma MAC",
+    },
+    {
         NID_grasshopper_mac,
+        &pmeth_grasshopper_mac,
+        &ameth_grasshopper_mac,
+        "KUZNYECHIK-MAC",
+        "GOST R 34.13-2015 Grasshopper MAC",
+    },
+    {
         NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac,
+        &pmeth_magma_mac_acpkm,
+        &ameth_magma_mac_acpkm,
+        "ID-TC26-CIPHER-GOSTR3412-2015-MAGMA-CTRACPKM-OMAC",
+        "GOST R 34.13-2015 Magma MAC ACPKM",
+    },
+    {
         NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac,
-        0
+        &pmeth_grasshopper_mac_acpkm,
+        &ameth_grasshopper_mac_acpkm,
+        "ID-TC26-CIPHER-GOSTR3412-2015-KUZNYECHIK-CTRACPKM-OMAC",
+        "GOST R 34.13-2015 Grasshopper MAC ACPKM",
+    },
+    { 0 },
 };
 
-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_magma_mac = NULL,  * pmeth_grasshopper_mac = NULL,
-        * pmeth_magma_mac_acpkm = NULL,  * pmeth_grasshopper_mac_acpkm = NULL;
+#ifndef OSSL_NELEM
+# define OSSL_NELEM(x) (sizeof(x)/sizeof((x)[0]))
+#endif
 
-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_magma_mac = NULL,  * ameth_grasshopper_mac = NULL,
-        * ameth_magma_mac_acpkm = NULL,  * ameth_grasshopper_mac_acpkm = NULL;
+static int known_digest_nids[OSSL_NELEM(gost_digest_array)];
+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;
@@ -121,79 +297,102 @@ static int gost_engine_finish(ENGINE* e) {
     return 1;
 }
 
-static int gost_engine_destroy(ENGINE* e) {
-    EVP_delete_digest_alias("streebog256");
-    EVP_delete_digest_alias("streebog512");
-    digest_gost_destroy();
-    digest_gost2012_256_destroy();
-    digest_gost2012_512_destroy();
+static void free_NIDs();
 
-    imit_gost_cpa_destroy();
-    imit_gost_cp_12_destroy();
-    magma_omac_destroy();
-    grasshopper_omac_destroy();
-    grasshopper_omac_acpkm_destroy();
+static int gost_engine_destroy(ENGINE* e) {
+    int i;
 
-    cipher_gost_destroy();
-    cipher_gost_grasshopper_destroy();
+    for (i = 0; i < OSSL_NELEM(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_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;
-    pmeth_magma_mac_acpkm = NULL;
-    pmeth_grasshopper_mac_acpkm = 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;
-    ameth_magma_mac_acpkm = NULL;
-    ameth_grasshopper_mac_acpkm = NULL;
-
-       ERR_unload_GOST_strings();
-       
+    struct gost_meth_minfo *minfo = gost_meth_array;
+    for (; minfo->nid; minfo++) {
+        *minfo->pmeth = NULL;
+        *minfo->ameth = NULL;
+    }
+
+    free_cached_groups();
+    free_NIDs();
+
+# ifndef BUILDING_GOST_PROVIDER
+    ERR_unload_GOST_strings();
+# endif
+
     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 GOST_NID_JOB *missing_NIDs[] = {
+    &kuznyechik_mgm_NID,
+    &magma_mgm_NID,
+};
+
+static int create_NIDs() {
+    int i;
+    int new_nid = OBJ_new_nid(OSSL_NELEM(missing_NIDs));
+    for (i = 0; i < OSSL_NELEM(missing_NIDs); i++) {
+        GOST_NID_JOB *job = missing_NIDs[i];
+        ASN1_OBJECT *obj =
+            ASN1_OBJECT_create(new_nid + i, NULL, 0, job->sn, job->ln);
+        job->asn1 = obj;
+        if (!obj || OBJ_add_object(obj) == NID_undef) {
+            OPENSSL_free(obj);
+            return 0;
+        }
+        (*missing_NIDs[i]->callback)(new_nid + i);
+    }
+    return 1;
+}
+
+static void free_NIDs() {
+    int i;
+    for (i = 0; i < OSSL_NELEM(missing_NIDs); i++) {
+        ASN1_OBJECT_free(missing_NIDs[i]->asn1);
+    }
+}
+
+# ifndef BUILDING_GOST_PROVIDER
+static
+# endif
+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");
+        fprintf(stderr, "ENGINE_set_id failed\n");
         goto end;
     }
     if (!ENGINE_set_name(e, engine_gost_name)) {
-        printf("ENGINE_set_name failed\n");
+        fprintf(stderr, "ENGINE_set_name failed\n");
+        goto end;
+    }
+    if (!create_NIDs()) {
+        fprintf(stderr, "NID creation failed\n");
         goto end;
     }
     if (!ENGINE_set_digests(e, gost_digests)) {
-        printf("ENGINE_set_digests failed\n");
+        fprintf(stderr, "ENGINE_set_digests failed\n");
         goto end;
     }
     if (!ENGINE_set_ciphers(e, gost_ciphers)) {
-        printf("ENGINE_set_ciphers failed\n");
+        fprintf(stderr, "ENGINE_set_ciphers failed\n");
         goto end;
     }
     if (!ENGINE_set_pkey_meths(e, gost_pkey_meths)) {
-        printf("ENGINE_set_pkey_meths failed\n");
+        fprintf(stderr, "ENGINE_set_pkey_meths failed\n");
         goto end;
     }
     if (!ENGINE_set_pkey_asn1_meths(e, gost_pkey_asn1_meths)) {
-        printf("ENGINE_set_pkey_asn1_meths failed\n");
+        fprintf(stderr, "ENGINE_set_pkey_asn1_meths failed\n");
         goto end;
     }
     /* Control function and commands */
@@ -211,286 +410,106 @@ static int bind_gost(ENGINE* e, const char* id) {
         goto end;
     }
 
-    if (!register_ameth_gost
-            (NID_id_GostR3410_2001, &ameth_GostR3410_2001, "GOST2001",
-             "GOST R 34.10-2001"))
-        goto end;
-    if (!register_ameth_gost
-            (NID_id_GostR3410_2012_256, &ameth_GostR3410_2012_256, "GOST2012_256",
-             "GOST R 34.10-2012 with 256 bit key"))
-        goto end;
-    if (!register_ameth_gost
-            (NID_id_GostR3410_2012_512, &ameth_GostR3410_2012_512, "GOST2012_512",
-             "GOST R 34.10-2012 with 512 bit key"))
-        goto end;
-    if (!register_ameth_gost(NID_id_Gost28147_89_MAC, &ameth_Gost28147_MAC,
-                             "GOST-MAC", "GOST 28147-89 MAC"))
-        goto end;
-    if (!register_ameth_gost(NID_gost_mac_12, &ameth_Gost28147_MAC_12,
-                             "GOST-MAC-12",
-                             "GOST 28147-89 MAC with 2012 params"))
-        goto end;
-    if (!register_ameth_gost(NID_magma_mac, &ameth_magma_mac,
-                             "MAGMA-MAC", "GOST R 34.13-2015 Magma MAC"))
-        goto end;
-    if (!register_ameth_gost(NID_grasshopper_mac, &ameth_grasshopper_mac,
-                             "GRASSHOPPER-MAC", "GOST R 34.13-2015 Grasshopper MAC"))
-        goto end;
-/*    if (!register_ameth_gost(NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac, &ameth_magma_mac_acpkm,
-                             "ID-TC26-CIPHER-GOSTR3412-2015-MAGMA-CTRACPKM-OMAC", "GOST R 34.13-2015 Magma MAC ACPKM"))
-        goto end;*/
-    if (!register_ameth_gost(NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac, &ameth_grasshopper_mac_acpkm,
-                             "ID-TC26-CIPHER-GOSTR3412-2015-KUZNYECHIK-CTRACPKM-OMAC", "GOST R 34.13-2015 Grasshopper MAC ACPKM"))
-        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++) {
+
+        /* This skip looks temporary. */
+        if (minfo->nid == NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac)
+            continue;
+
+        if (!register_ameth_gost(minfo->nid, minfo->ameth, minfo->pemstr,
+                minfo->info))
+            goto end;
+        if (!register_pmeth_gost(minfo->nid, minfo->pmeth, 0))
+            goto end;
+    }
 
+    ret = 1;
+  end:
+    return ret;
+}
 
-    if (!register_pmeth_gost(NID_id_GostR3410_2001, &pmeth_GostR3410_2001, 0))
-        goto end;
+#ifndef BUILDING_GOST_PROVIDER
+static int bind_gost_engine(ENGINE* e) {
+    int ret = 0;
 
-    if (!register_pmeth_gost
-            (NID_id_GostR3410_2012_256, &pmeth_GostR3410_2012_256, 0))
-        goto end;
-    if (!register_pmeth_gost
-            (NID_id_GostR3410_2012_512, &pmeth_GostR3410_2012_512, 0))
-        goto end;
-    if (!register_pmeth_gost
-            (NID_id_Gost28147_89_MAC, &pmeth_Gost28147_MAC, 0))
-        goto end;
-    if (!register_pmeth_gost(NID_gost_mac_12, &pmeth_Gost28147_MAC_12, 0))
-        goto end;
-    if (!register_pmeth_gost(NID_magma_mac, &pmeth_magma_mac, 0))
-        goto end;
-    if (!register_pmeth_gost(NID_grasshopper_mac, &pmeth_grasshopper_mac, 0))
-        goto end;
-/*    if (!register_pmeth_gost(NID_magma_mac_acpkm, &pmeth_magma_mac_acpkm, 0))
-        goto end;*/
-    if (!register_pmeth_gost(NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac, &pmeth_grasshopper_mac_acpkm, 0))
-        goto end;
     if (!ENGINE_register_ciphers(e)
         || !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_cbc())
-        || !EVP_add_cipher(cipher_gost_cpacnt())
-        || !EVP_add_cipher(cipher_gost_cpcnt_12())
-        || !EVP_add_cipher(cipher_gost_grasshopper_ecb())
-        || !EVP_add_cipher(cipher_gost_grasshopper_cbc())
-        || !EVP_add_cipher(cipher_gost_grasshopper_cfb())
-        || !EVP_add_cipher(cipher_gost_grasshopper_ofb())
-        || !EVP_add_cipher(cipher_gost_grasshopper_ctr())
-        || !EVP_add_cipher(cipher_gost_grasshopper_ctracpkm())
-        || !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())
-        || !EVP_add_digest(imit_gost_cpa())
-        || !EVP_add_digest(imit_gost_cp_12())
-        || !EVP_add_digest(magma_omac())
-        || !EVP_add_digest(grasshopper_omac())
-/*        || !EVP_add_digest(magma_omac_acpkm()) */
-        || !EVP_add_digest(grasshopper_omac_acpkm())
-            ) {
+        || !ENGINE_register_pkey_meths(e))
         goto end;
+
+    int i;
+    for (i = 0; i < OSSL_NELEM(gost_cipher_array); i++) {
+        if (!EVP_add_cipher(GOST_init_cipher(gost_cipher_array[i])))
+            goto end;
     }
 
-    if(!EVP_add_digest_alias(SN_id_GostR3411_2012_256, "streebog256")
-       ||      !EVP_add_digest_alias(SN_id_GostR3411_2012_512, "streebog512")) {
-        goto end;
+    for (i = 0; i < OSSL_NELEM(gost_digest_array); i++) {
+        if (!EVP_add_digest(GOST_init_digest(gost_digest_array[i])))
+            goto end;
     }
 
     ENGINE_register_all_complete();
 
     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 */
-
-static int gost_digests(ENGINE* e, const EVP_MD** digest,
-                        const int** nids, int nid) {
-    int ok = 1;
-    if (digest == NULL) {
-        return gost_digest_nids(nids);
-    }
-    if (nid == NID_id_GostR3411_94) {
-        *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();
-    } else if (nid == NID_id_GostR3411_2012_512) {
-        *digest = digest_gost2012_512();
-    } else if (nid == NID_gost_mac_12) {
-        *digest = imit_gost_cp_12();
-    } else if (nid == NID_magma_mac) {
-        *digest = magma_omac();
-    } else if (nid == NID_grasshopper_mac) {
-        *digest = grasshopper_omac();
-    } else if (nid == NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac) {
-        *digest = grasshopper_omac_acpkm();
-    } else {
-        ok = 0;
-        *digest = NULL;
-    }
-    return ok;
-}
-
-static int gost_ciphers(ENGINE* e, const EVP_CIPHER** cipher,
-                        const int** nids, int nid) {
-    int ok = 1;
-    if (cipher == NULL) {
-        *nids = gost_cipher_nids;
-        return sizeof(gost_cipher_nids) / sizeof(gost_cipher_nids[0]) - 1;
-    }
-
-    if (nid == NID_id_Gost28147_89) {
-        *cipher = cipher_gost();
-    } else if (nid == NID_gost89_cnt) {
-        *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 if (nid == NID_grasshopper_ecb) {
-        *cipher = cipher_gost_grasshopper_ecb();
-    } else if (nid == NID_grasshopper_cbc) {
-        *cipher = cipher_gost_grasshopper_cbc();
-    } else if (nid == NID_grasshopper_cfb) {
-        *cipher = cipher_gost_grasshopper_cfb();
-    } else if (nid == NID_grasshopper_ofb) {
-        *cipher = cipher_gost_grasshopper_ofb();
-    } else if (nid == NID_grasshopper_ctr) {
-        *cipher = cipher_gost_grasshopper_ctr();
-    } else if (nid == NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm) {
-        *cipher = cipher_gost_grasshopper_ctracpkm();
-    } 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;
+static int check_gost_engine(ENGINE* e, const char* id)
+{
+    if (id != NULL && strcmp(id, engine_gost_id) != 0)
+        return 0;
+    if (ameth_GostR3410_2001) {
+        printf("GOST engine already loaded\n");
+        return 0;
     }
-    return ok;
+    return 1;
 }
 
-static int gost_pkey_meths(ENGINE* e, EVP_PKEY_METHOD** pmeth,
-                           const int** nids, int nid) {
-    if (pmeth == NULL) {
-        *nids = gost_pkey_meth_nids;
-        return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) - 1;
-    }
-
-    switch (nid) {
-        case NID_id_GostR3410_2001:
-            *pmeth = pmeth_GostR3410_2001;
-            return 1;
-        case NID_id_GostR3410_2012_256:
-            *pmeth = pmeth_GostR3410_2012_256;
-            return 1;
-        case NID_id_GostR3410_2012_512:
-            *pmeth = pmeth_GostR3410_2012_512;
-            return 1;
-        case NID_id_Gost28147_89_MAC:
-            *pmeth = pmeth_Gost28147_MAC;
-            return 1;
-        case NID_gost_mac_12:
-            *pmeth = pmeth_Gost28147_MAC_12;
-            return 1;
-        case NID_magma_mac:
-            *pmeth = pmeth_magma_mac;
-            return 1;
-        case NID_grasshopper_mac:
-            *pmeth = pmeth_grasshopper_mac;
-            return 1;
-        case NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac:
-            *pmeth = pmeth_magma_mac_acpkm;
-            return 1;
-        case NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac:
-            *pmeth = pmeth_grasshopper_mac_acpkm;
-            return 1;
-
-        default:;
-    }
-
-    *pmeth = NULL;
-    return 0;
+static int make_gost_engine(ENGINE* e, const char* id)
+{
+    return check_gost_engine(e, id)
+        && populate_gost_engine(e)
+        && bind_gost_engine(e);
 }
 
-static int gost_pkey_asn1_meths(ENGINE* e, EVP_PKEY_ASN1_METHOD** ameth,
-                                const int** nids, int nid) {
-    if (ameth == NULL) {
-        *nids = gost_pkey_meth_nids;
-        return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) - 1;
-    }
+#ifndef BUILDING_ENGINE_AS_LIBRARY
 
-    switch (nid) {
-        case NID_id_GostR3410_2001:
-            *ameth = ameth_GostR3410_2001;
-            return 1;
-        case NID_id_GostR3410_2012_256:
-            *ameth = ameth_GostR3410_2012_256;
-            return 1;
-        case NID_id_GostR3410_2012_512:
-            *ameth = ameth_GostR3410_2012_512;
-            return 1;
-        case NID_id_Gost28147_89_MAC:
-            *ameth = ameth_Gost28147_MAC;
-            return 1;
-        case NID_gost_mac_12:
-            *ameth = ameth_Gost28147_MAC_12;
-            return 1;
-        case NID_magma_mac:
-            *ameth = ameth_magma_mac;
-            return 1;
-        case NID_grasshopper_mac:
-            *ameth = ameth_grasshopper_mac;
-            return 1;
-        case NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac:
-            *ameth = ameth_magma_mac_acpkm;
-            return 1;
-        case NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac:
-            *ameth = ameth_grasshopper_mac_acpkm;
-            return 1;
+/*
+ * 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.
+ */
 
+IMPLEMENT_DYNAMIC_BIND_FN(make_gost_engine)
+IMPLEMENT_DYNAMIC_CHECK_FN()
 
-        default:;
-    }
-
-    *ameth = NULL;
-    return 0;
-}
-
-#ifdef OPENSSL_NO_DYNAMIC_ENGINE
-
-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;
-}
+#else
 
+/*
+ * 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
+#endif
+/* vim: set expandtab cinoptions=\:0,l1,t0,g0,(0 sw=4 : */