X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_eng.c;h=f7ca26318caa6d458c020470456a0692ad339855;hb=5d5cf4ef13193928b9a3e5964ead3a023b13c591;hp=69f99757c2ae704a324930297ee71eef0502963e;hpb=9bcbcfa0193491800b3d0afa140828488b6b84de;p=openssl-gost%2Fengine.git diff --git a/gost_eng.c b/gost_eng.c index 69f9975..f7ca263 100644 --- a/gost_eng.c +++ b/gost_eng.c @@ -50,6 +50,11 @@ static int gost_cipher_nids[] = { NID_magma_cbc, NID_magma_ctr, NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm, +#ifdef NID_kuznyechik_mgm + NID_kuznyechik_mgm, +#else + NID_undef, +#endif 0 }; @@ -280,6 +285,9 @@ static int bind_gost(ENGINE* e, const char* id) { || !EVP_add_cipher(cipher_gost_grasshopper_ofb()) || !EVP_add_cipher(cipher_gost_grasshopper_ctr()) || !EVP_add_cipher(cipher_gost_grasshopper_ctracpkm()) +#ifdef NID_kuznyechik_mgm + || !EVP_add_cipher(cipher_gost_grasshopper_mgm()) +#endif || !EVP_add_cipher(cipher_magma_cbc()) || !EVP_add_cipher(cipher_magma_ctr()) || !EVP_add_digest(digest_gost()) @@ -370,6 +378,10 @@ static int gost_ciphers(ENGINE* e, const EVP_CIPHER** cipher, *cipher = cipher_gost_grasshopper_ctr(); } else if (nid == NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm) { *cipher = cipher_gost_grasshopper_ctracpkm(); +#ifdef NID_kuznyechik_mgm + } else if (nid == NID_kuznyechik_mgm) { + *cipher = cipher_gost_grasshopper_mgm(); +#endif } else if (nid == NID_magma_cbc) { *cipher = cipher_magma_cbc(); } else if (nid == NID_magma_ctr) {