X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_eng.c;h=1f2565400bfce17c944ede17d6b2922ce231f300;hb=bca47af46027b1b84c23af1c84aef1bf901778f8;hp=ba67fda6181854d427a341546e9e2e62b0136a69;hpb=37e242a6a246cbf51d0e7f16f11f122a8c2051eb;p=openssl-gost%2Fengine.git diff --git a/gost_eng.c b/gost_eng.c index ba67fda..1f25654 100644 --- a/gost_eng.c +++ b/gost_eng.c @@ -48,6 +48,7 @@ static int gost_cipher_nids[] = { NID_grasshopper_ofb, NID_grasshopper_ctr, NID_magma_cbc, + NID_magma_ctr, 0 }; @@ -252,11 +253,14 @@ 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_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()) ) { goto end; } @@ -329,6 +333,8 @@ static int gost_ciphers(ENGINE* e, const EVP_CIPHER** cipher, *cipher = cipher_gost_grasshopper_ctr(); } 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;