From: Dmitry Belyavskiy Date: Sun, 10 May 2020 15:00:03 +0000 (+0300) Subject: Restore kuznyechik-mac test X-Git-Tag: v3.0.0~119 X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=openssl-gost%2Fengine.git;a=commitdiff_plain;h=1c71e8ae208a52a28b21767635e3c8921d1b6a17 Restore kuznyechik-mac test --- diff --git a/gost_eng.c b/gost_eng.c index 25bbe38..78e609f 100644 --- a/gost_eng.c +++ b/gost_eng.c @@ -234,7 +234,7 @@ static struct gost_meth_minfo { NID_grasshopper_mac, &pmeth_grasshopper_mac, &ameth_grasshopper_mac, - "GRASSHOPPER-MAC", + "KUZNYECHIK-MAC", "GOST R 34.13-2015 Grasshopper MAC", }, { diff --git a/tcl_tests/mac.try b/tcl_tests/mac.try index 0e5be42..51561f4 100644 --- a/tcl_tests/mac.try +++ b/tcl_tests/mac.try @@ -114,9 +114,9 @@ test "Вычисление MAC magma-mac (пример из ГОСТ 2015 34.13) grep magma-mac [openssl "dgst -mac magma-mac -macopt hexkey:ffeeddccbbaa99887766554433221100f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff mac-magma.dat"] } 0 "MAGMA-MAC-magma-mac(mac-magma.dat)= 154e72102030c5bb\n" -#FIXME my regression -#test "Вычисление MAC grasshopper-mac (пример из ГОСТ 2015 34.13)" { -# grep grasshopper-mac [openssl "dgst -mac kuznyechik-mac -macopt hexkey:8899aabbccddeeff0011223344556677fedcba98765432100123456789abcdef mac-grasshopper.dat"] -#} 0 "KUZNYECHIK-MAC-kuznyechik-mac(mac-grasshopper.dat)= 336f4d296059fbe34ddeb35b37749c67\n" +FIXME my regression +test "Вычисление MAC grasshopper-mac (пример из ГОСТ 2015 34.13)" { + grep grasshopper-mac [openssl "dgst -mac kuznyechik-mac -macopt hexkey:8899aabbccddeeff0011223344556677fedcba98765432100123456789abcdef mac-grasshopper.dat"] +} 0 "KUZNYECHIK-MAC-kuznyechik-mac(mac-grasshopper.dat)= 336f4d296059fbe34ddeb35b37749c67\n" end_tests