NID_grasshopper_ofb,
NID_grasshopper_ctr,
NID_magma_cbc,
+ NID_magma_ctr,
+ NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm,
0
};
static int gost_digest_nids(const int** nids) {
- static int digest_nids[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+ static int digest_nids[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
static int pos = 0;
static int init = 0;
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;
NID_gost_mac_12,
NID_magma_mac,
NID_grasshopper_mac,
+ NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac,
+ NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac,
0
};
* 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 = 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_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 = NULL, * ameth_grasshopper_mac = NULL,
+ * ameth_magma_mac_acpkm = NULL, * ameth_grasshopper_mac_acpkm = NULL;
static int gost_engine_init(ENGINE* e) {
return 1;
}
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();
- magma_omac_destroy();
- grasshopper_omac_destroy();
-
- cipher_gost_destroy();
-
- 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;
-
- 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;
-
- ERR_unload_GOST_strings();
-
- return 1;
+ EVP_delete_digest_alias("streebog256");
+ EVP_delete_digest_alias("streebog512");
+ digest_gost_destroy();
+ digest_gost2012_256_destroy();
+ digest_gost2012_512_destroy();
+
+ imit_gost_cpa_destroy();
+ imit_gost_cp_12_destroy();
+ magma_omac_destroy();
+ grasshopper_omac_destroy();
+ grasshopper_omac_acpkm_destroy();
+
+ cipher_gost_destroy();
+ cipher_gost_grasshopper_destroy();
+
+ 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();
+
+ return 1;
}
static int bind_gost(ENGINE* e, const char* id) {
"GOST 28147-89 MAC with 2012 params"))
goto end;
if (!register_ameth_gost(NID_magma_mac, &ameth_magma_mac,
- "MAGMA-OMAC", "GOST R 34.13-2015 Magma MAC"))
+ "MAGMA-MAC", "GOST R 34.13-2015 Magma MAC"))
goto end;
if (!register_ameth_gost(NID_grasshopper_mac, &ameth_grasshopper_mac,
- "GRASSHOPPER-OMAC", "GOST R 34.13-2015 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;
+
if (!register_pmeth_gost(NID_id_GostR3410_2001, &pmeth_GostR3410_2001, 0))
goto end;
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)
|| !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())
) {
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;
+ }
+
ENGINE_register_all_complete();
ERR_load_GOST_strings();
*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;
*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;
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:;
}
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;
+
default:;
}