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_94,
NID_id_GostR3410_2001,
NID_id_Gost28147_89_MAC,
NID_id_GostR3410_2012_256,
0
};
-static EVP_PKEY_METHOD *pmeth_GostR3410_94 = NULL,
- *pmeth_GostR3410_2001 = NULL,
+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_94 = NULL,
- *ameth_GostR3410_2001 = 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)
{
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();
+
gost_param_free();
- pmeth_GostR3410_94 = NULL;
pmeth_GostR3410_2001 = NULL;
pmeth_Gost28147_MAC = NULL;
pmeth_GostR3410_2012_256 = NULL;
pmeth_GostR3410_2012_512 = NULL;
pmeth_Gost28147_MAC_12 = NULL;
- ameth_GostR3410_94 = NULL;
ameth_GostR3410_2001 = NULL;
ameth_Gost28147_MAC = NULL;
ameth_GostR3410_2012_256 = NULL;
int ret = 0;
if (id && strcmp(id, engine_gost_id))
return 0;
-
- if (ameth_GostR3410_94) {
+ if (ameth_GostR3410_2001) {
printf("GOST engine already loaded\n");
goto end;
}
goto end;
}
- if (!register_ameth_gost
- (NID_id_GostR3410_94, &ameth_GostR3410_94, "GOST94",
- "GOST R 34.10-94"))
- goto end;
if (!register_ameth_gost
(NID_id_GostR3410_2001, &ameth_GostR3410_2001, "GOST2001",
"GOST R 34.10-2001"))
"GOST 28147-89 MAC with 2012 params"))
goto end;
- if (!register_pmeth_gost(NID_id_GostR3410_94, &pmeth_GostR3410_94, 0))
- goto end;
if (!register_pmeth_gost(NID_id_GostR3410_2001, &pmeth_GostR3410_2001, 0))
goto end;
+
if (!register_pmeth_gost
(NID_id_GostR3410_2012_256, &pmeth_GostR3410_2012_256, 0))
goto end;
|| !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)
- || !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(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;
}
{
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;
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_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;
{
if (!pmeth) {
*nids = gost_pkey_meth_nids;
- return 6;
+ return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) -
+ 1;
}
switch (nid) {
- case NID_id_GostR3410_94:
- *pmeth = pmeth_GostR3410_94;
- return 1;
case NID_id_GostR3410_2001:
*pmeth = pmeth_GostR3410_2001;
return 1;
{
if (!ameth) {
*nids = gost_pkey_meth_nids;
- return 6;
+ return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) -
+ 1;
}
switch (nid) {
- case NID_id_GostR3410_94:
- *ameth = ameth_GostR3410_94;
- return 1;
case NID_id_GostR3410_2001:
*ameth = ameth_GostR3410_2001;
return 1;
void ENGINE_load_gost(void)
{
ENGINE *toadd;
- if (pmeth_GostR3410_94)
+ if (pmeth_GostR3410_2001)
return;
toadd = engine_gost();
if (!toadd)