X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_eng.c;h=9df6a74da9ad420c6e0f06189a56be2d012946bd;hb=13dcbd17f3c370a7005459e1b2e6470b0262d844;hp=5924791b7735d35ff7ab1e97b3fc608e3cfb4f3a;hpb=c98ba9d03213d0c63d6874539d59f7b55fbc3fae;p=openssl-gost%2Fengine.git diff --git a/gost_eng.c b/gost_eng.c index 5924791..9df6a74 100644 --- a/gost_eng.c +++ b/gost_eng.c @@ -33,20 +33,42 @@ 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, 0 }; +static int gost_cipher_nids[] = { + NID_id_Gost28147_89, + NID_gost89_cnt, + NID_gost89_cnt_12, + 0 +}; -static int gost_digest_nids[] = - { NID_id_GostR3411_94, NID_id_Gost28147_89_MAC, 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_pkey_meth_nids[] = { NID_id_GostR3410_94, - NID_id_GostR3410_2001, NID_id_Gost28147_89_MAC, 0 +static int gost_pkey_meth_nids[] = { + NID_id_GostR3410_2001, + NID_id_Gost28147_89_MAC, + NID_id_GostR3410_2012_256, + NID_id_GostR3410_2012_512, + NID_gost_mac_12, + 0 }; -static EVP_PKEY_METHOD *pmeth_GostR3410_94 = NULL, - *pmeth_GostR3410_2001 = NULL, *pmeth_Gost28147_MAC = 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; -static EVP_PKEY_ASN1_METHOD *ameth_GostR3410_94 = NULL, - *ameth_GostR3410_2001 = NULL, *ameth_Gost28147_MAC = 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; static int gost_engine_init(ENGINE *e) { @@ -62,12 +84,18 @@ static int gost_engine_destroy(ENGINE *e) { gost_param_free(); - pmeth_GostR3410_94 = NULL; pmeth_GostR3410_2001 = NULL; pmeth_Gost28147_MAC = NULL; - ameth_GostR3410_94 = NULL; + pmeth_GostR3410_2012_256 = NULL; + pmeth_GostR3410_2012_512 = NULL; + pmeth_Gost28147_MAC_12 = NULL; + ameth_GostR3410_2001 = NULL; ameth_Gost28147_MAC = NULL; + ameth_GostR3410_2012_256 = NULL; + ameth_GostR3410_2012_512 = NULL; + ameth_Gost28147_MAC_12 = NULL; + return 1; } @@ -76,11 +104,10 @@ static int bind_gost(ENGINE *e, const char *id) 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; } - if (!ENGINE_set_id(e, engine_gost_id)) { printf("ENGINE_set_id failed\n"); goto end; @@ -120,33 +147,52 @@ static int bind_gost(ENGINE *e, const char *id) 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")) 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_pmeth_gost(NID_id_GostR3410_94, &pmeth_GostR3410_94, 0)) + 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_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; + 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 (!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_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) ) { goto end; } @@ -167,15 +213,18 @@ static int gost_digests(ENGINE *e, const EVP_MD **digest, int ok = 1; if (!digest) { *nids = gost_digest_nids; - return 2; + return 5; } - /* - * printf("Digest no %d requested\n",nid); - */ if (nid == NID_id_GostR3411_94) { *digest = &digest_gost; + } 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_id_Gost28147_89_MAC) { *digest = &imit_gost_cpa; + } else if (nid == NID_gost_mac_12) { + *digest = &imit_gost_cp_12; } else { ok = 0; *digest = NULL; @@ -189,13 +238,15 @@ static int gost_ciphers(ENGINE *e, const EVP_CIPHER **cipher, int ok = 1; if (!cipher) { *nids = gost_cipher_nids; - return 2; /* two ciphers are supported */ + return 3; /* three ciphers are supported */ } 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 { ok = 0; *cipher = NULL; @@ -208,19 +259,26 @@ static int gost_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth, { if (!pmeth) { *nids = gost_pkey_meth_nids; - return 3; + return sizeof(gost_pkey_meth_nids)/sizeof(int) - 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; + 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; + default:; } @@ -233,18 +291,24 @@ static int gost_pkey_asn1_meths(ENGINE *e, EVP_PKEY_ASN1_METHOD **ameth, { if (!ameth) { *nids = gost_pkey_meth_nids; - return 3; + return sizeof(gost_pkey_meth_nids)/sizeof(int) - 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; + 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; default:; } @@ -269,7 +333,7 @@ static ENGINE *engine_gost(void) void ENGINE_load_gost(void) { ENGINE *toadd; - if (pmeth_GostR3410_94) + if (pmeth_GostR3410_2001) return; toadd = engine_gost(); if (!toadd)