NID_id_Gost28147_89,
NID_gost89_cnt,
NID_gost89_cnt_12,
+ NID_gost89_cbc,
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_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)
{
|| !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)
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;
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 sizeof(gost_pkey_meth_nids)/sizeof(int) - 1;
+ return sizeof(gost_pkey_meth_nids) / sizeof(gost_pkey_meth_nids[0]) -
+ 1;
}
switch (nid) {
{
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: