X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tcl_tests%2Fmac.try;h=8305f5dbff99bfdf64f8895c72e83a6a260f343c;hb=27245fdabff573bb85d6aeb2e228a854170296ee;hp=9b261e8e93f8319204ffca71b5596bb5e8fa7289;hpb=b0f5bce10dcc05198e2e58ee08e1cc3dcd3d1aea;p=openssl-gost%2Fengine.git

diff --git a/tcl_tests/mac.try b/tcl_tests/mac.try
index 9b261e8..8305f5d 100644
--- a/tcl_tests/mac.try
+++ b/tcl_tests/mac.try
@@ -10,23 +10,23 @@ test -createsfiles {dgst.dat dgst0.dat dgst2.dat dgst8.dat dgst63.dat mac-grassh
 	makeFile dgst2.dat [string repeat "1\n" 1] binary
 	makeFile dgst8.dat [string repeat "1\n" 4] binary
 	makeFile dgst63.dat "012345678901234567890123456789012345678901234567890123456789012" binary
-	file copy -force ../mac-grasshopper.dat ../mac-magma.dat .
+	file copy -force $::test::src/mac-grasshopper.dat $::test::src/mac-magma.dat .
 } 0 ""
 
 test "Вычисление HMAC(md_gost12_512)" {
-	grep "md_gost12_512\\(" [openssl "dgst -md_gost12_512 -mac hmac -macopt key:123456901234567890123456789012 dgst63.dat"]
+	grep "md_gost12_512\\(" [openssl "dgst -md_gost12_512 -hmac 123456901234567890123456789012 dgst63.dat"]
 } 0 "HMAC-md_gost12_512(dgst63.dat)= 3767bcbe31de0965a6cd2613d99cc8cda922e7b288478389ed9bd433abfc08ff61d9bd0257b2d14dd0648d04ebf056180b3c8739a7cd7f8a78dac856359fe26f\n"
 
 test "Вычисление двух HMAC(md_gost12_512)" {
-	grep "md_gost12_512\\(" [openssl "dgst -md_gost12_512 -mac hmac -macopt key:123456901234567890123456789012 dgst63.dat dgst63.dat"]
+	grep "md_gost12_512\\(" [openssl "dgst -md_gost12_512 -hmac 123456901234567890123456789012 dgst63.dat dgst63.dat"]
 } 0 "HMAC-md_gost12_512(dgst63.dat)= 3767bcbe31de0965a6cd2613d99cc8cda922e7b288478389ed9bd433abfc08ff61d9bd0257b2d14dd0648d04ebf056180b3c8739a7cd7f8a78dac856359fe26f\nHMAC-md_gost12_512(dgst63.dat)= 3767bcbe31de0965a6cd2613d99cc8cda922e7b288478389ed9bd433abfc08ff61d9bd0257b2d14dd0648d04ebf056180b3c8739a7cd7f8a78dac856359fe26f\n"
 
 test "Вычисление HMAC(md_gost94)" {
-	grep "md_gost94\\(" [openssl "dgst -md_gost94 -mac hmac -macopt key:123456901234567890123456789012 dgst.dat"]
+	grep "md_gost94\\(" [openssl "dgst -md_gost94 -hmac 123456901234567890123456789012 dgst.dat"]
 } 0 "HMAC-md_gost94(dgst.dat)= 25434aa4b59b9749d3716ac188762b6c92b47d552aeb556f74b9c357b2b7c8c6\n"
 
 test "Вычисление двух HMAC(md_gost94)" {
-	grep "md_gost94\\(" [openssl "dgst -md_gost94 -mac hmac -macopt key:123456901234567890123456789012 dgst.dat dgst.dat"]
+	grep "md_gost94\\(" [openssl "dgst -md_gost94 -hmac 123456901234567890123456789012 dgst.dat dgst.dat"]
 } 0 "HMAC-md_gost94(dgst.dat)= 25434aa4b59b9749d3716ac188762b6c92b47d552aeb556f74b9c357b2b7c8c6\nHMAC-md_gost94(dgst.dat)= 25434aa4b59b9749d3716ac188762b6c92b47d552aeb556f74b9c357b2b7c8c6\n"
 
 test "Попытка вычислить MAC с ключом неправильной длины" {
@@ -113,8 +113,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 grasshopper-mac -macopt hexkey:8899aabbccddeeff0011223344556677fedcba98765432100123456789abcdef mac-grasshopper.dat"]
-} 0 "GRASSHOPPER-MAC-grasshopper-mac(mac-grasshopper.dat)= 336f4d296059fbe34ddeb35b37749c67\n"
+	grep kuznyechik-mac [openssl "dgst -mac kuznyechik-mac -macopt hexkey:8899aabbccddeeff0011223344556677fedcba98765432100123456789abcdef mac-grasshopper.dat"]
+} 0 "KUZNYECHIK-MAC-kuznyechik-mac(mac-grasshopper.dat)= 336f4d296059fbe34ddeb35b37749c67\n"
 
 end_tests