Correct etalon values for hash 2012

diff --git a/test/01-digest.t b/test/01-digest.t
index c762dc210c707527f3a1459bad8693d10b929890..001763faca6a6603c75df4afa3094f796624eb55 100644 (file)
--- a/test/01-digest.t
+++ b/test/01-digest.t
@@ -1,13 +1,7 @@
 #!/usr/bin/perl 
-use Test::More tests => 12;
+use Test::More tests => 16;
 use Cwd 'abs_path';
 
-# prepare data for 
-
-open F,">","testdata.dat";
-binmode F;
-print F "12345670" x 128;
-close F;
 # Set OPENSSL_ENGINES environment variable to just build engine
 $ENV{'OPENSSL_ENGINES'} = abs_path("../.libs");
 # Set engine name from environment to allow testing of different engines
@@ -15,16 +9,49 @@ $engine=$ENV{'ENGINE_NAME'}||"gost";
 # Reopen STDERR to eliminate extra output
 open STDERR, ">>","tests.err";
 
+# prepare data for 
+
+open F,">","testm1.dat";
+print F "012345678901234567890123456789012345678901234567890123456789012";
+close F;
+is(`openssl dgst -engine ${engine} -md_gost12_256 testm1.dat`,
+"md_gost12_256(testm1.dat)= 9d151eefd8590b89daa6ba6cb74af9275dd051026bb149a452fd84e5e57b5500\n",
+"GOST R 34.11-2012 256bit example 1 from standard");
+
+is(`openssl dgst -engine ${engine} -md_gost12_512 testm1.dat`,
+"md_gost12_512(testm1.dat)= 1b54d01a4af5b9d5cc3d86d68d285462b19abc2475222f35c085122be4ba1ffa00ad30f8767b3a82384c6574f024c311e2a481332b08ef7f41797891c1646f48\n",
+"GOST R 34.11-2012 512bit example 1 from standard");
+
+unlink("testm1.dat");
+
+open F,">","testm2.dat";
+print F pack("H*","d1e520e2e5f2f0e82c20d1f2f0e8e1eee6e820e2edf3f6e82c20e2e5fef2fa20f120eceef0ff20f1f2f0e5ebe0ece820ede020f5f0e0e1f0fbff20efebfaeafb20c8e3eef0e5e2fb");
+close F;
+is(`openssl dgst -engine ${engine} -md_gost12_256 testm2.dat`,
+"md_gost12_256(testm2.dat)= 9dd2fe4e90409e5da87f53976d7405b0c0cac628fc669a741d50063c557e8f50\n",
+"GOST R 34.11-2012 256bit example 2 from standard");
+
+is(`openssl dgst -engine ${engine} -md_gost12_512 testm2.dat`,
+"md_gost12_512(testm2.dat)= 1e88e62226bfca6f9994f1f2d51569e0daf8475a3b0fe61a5300eee46d961376035fe83549ada2b8620fcd7c496ce5b33f0cb9dddc2b6460143b03dabac9fb28\n",
+"GOST R 34.11-2012 512bit example 2 from standard");
+
+unlink("testm1.dat");
+
+
+open F,">","testdata.dat";
+binmode F;
+print F "12345670" x 128;
+close F;
 is(`openssl dgst -engine ${engine} -md_gost94 testdata.dat`,
 "md_gost94(testdata.dat)= f7fc6d16a6a5c12ac4f7d320e0fd0d8354908699125e09727a4ef929122b1cae\n",
 "GOST R 34.11-94 1K ascii");
 
 is(`openssl dgst -engine ${engine} -md_gost12_256 testdata.dat`,
-"md_gost12_256(testdata.dat)= d38a79cb15db40651051ef6879881fe25d84cdbb23ecec9f56126f8803f5fc88\n",
+"md_gost12_256(testdata.dat)= 1906512b86a1283c68cec8419e57113efc562a1d0e95d8f4809542900c416fe4\n",
 "GOST R 34.11-2012 256bit 1K ascii");
 
 is(`openssl dgst -engine ${engine} -md_gost12_512 testdata.dat`,
-"md_gost12_512(testdata.dat)= ac48be903716d9b9701fd8cdd75417b9085b5b642191926afd92310e645c52d465e36bbd5ccb356c5b1b8020a868915d5d8cc18ed2c07c28d24ba914b867f144\n",
+"md_gost12_512(testdata.dat)= 283587e434864d0d4bea97c0fb10e2dd421572fc859304bdf6a94673d652c59049212bad7802b4fcf5eecc1f8fab569d60f2c20dbd789a7fe4efbd79d8137ee7\n",
 "GOST R 34.11-2012 512bit 1K ascii");
 
 unlink("testdata.dat");
@@ -39,11 +66,11 @@ is(`openssl dgst -engine ${engine} -md_gost94 testdata2.dat`,
 "GOST R 34.11-94 1K binary");
 
 is(`openssl dgst -engine ${engine} -md_gost12_256 testdata2.dat`,
-"md_gost12_256(testdata2.dat)= 88fb2a93873befc1712c96c6e151223b18798de4601448efe2836dbfa53a55f2\n",
+"md_gost12_256(testdata2.dat)= 2eb1306be3e490f18ff0e2571a077b3831c815c46c7d4fdf9e0e26de4032b3f3\n",
 "GOST R 34.11-2012 256bit 1K binary");
 
 is(`openssl dgst -engine ${engine} -md_gost12_512 testdata2.dat`,
-"md_gost12_512(testdata2.dat)= 559b71aaad8e0e749cbac47ff1eaa48471bafaf81e648b234c456e5d25538c32a61d04e3f5863301fdf1f289efc286cb1c317aba3e6425bece26e8cfe35a4074\n",
+"md_gost12_512(testdata2.dat)= 55656e5bcf795b499031a7833cd7dc18fe10d4a47e15be545c6ab3f304a4fe411c4c39de5b1fc6844880111441e0b92bf1ec2fb7840453fe39a2b70ced461968\n",
 "GOST R 34.11-2012 512bit 1K binary");
 
 unlink("testdata2.dat");
@@ -58,11 +85,11 @@ is(`openssl dgst -engine ${engine} -md_gost94 testdata3.dat`,
 "GOST R 34.11-94 539 bytes");
 
 is(`openssl dgst -engine ${engine} -md_gost12_256 testdata3.dat`,
-"md_gost12_256(testdata3.dat)= 3791fa0d152ee406be966c1ef2729ea1dcac370556971cfb08123100735d476c\n",
+"md_gost12_256(testdata3.dat)= c98a17f9fadff78d08521e4179a7b2e6275f3b1da88339a3cb961a3514e5332e\n",
 "GOST R 34.11-2012 256bit 539 bytes");
 
 is(`openssl dgst -engine ${engine} -md_gost12_512 testdata3.dat`,
-"md_gost12_512(testdata3.dat)= 62a09dfad97d84b2020a4ab464c878933210b6d23cbfe0c1d1e7fb9093e360fc052e30c5b7bc27ac7d207fcf51ab59058fb2474d08e664cd040c3b8d2d2f49d6\n",
+"md_gost12_512(testdata3.dat)= d5ad93fbc9ed7abc1cf28d00827a052b40bea74b04c4fd753102c1bcf9f9dad5142887f8a4cceaa0d64a0a8291592413d6adb956b99138a0023e127ff37bdf08\n",
 "GOST R 34.11-2012 512bit 539 bytes");
 
 unlink "testdata3.dat";
@@ -76,11 +103,11 @@ is(`openssl dgst -engine ${engine} -md_gost94 bigdata.dat`,
 "GOST R 34.11-94 128K");
 
 is(`openssl dgst -engine ${engine} -md_gost12_256 bigdata.dat`,
-"md_gost12_256(bigdata.dat)= d50eeeff483f8b5f550d944decb60846f0a6b34f2f7d44a6f725af1578385d47\n",
+"md_gost12_256(bigdata.dat)= 50e935d725d9359e5991b6b7eba8b3539fca03584d26adf4c827c982ffd49367\n",
 "GOST R 34.11-2012 256bit 128K");
 
 is(`openssl dgst -engine ${engine} -md_gost12_512 bigdata.dat`,
-"md_gost12_512(bigdata.dat)= d57b8b8ea4061822b47df128fe92bd6db4fd6c8e3c537806ae1782ba67fab474c390b9564c3e4867562e0c3ad974d37d5fa6c5b5a3699e984b45845acbcf298a\n",
+"md_gost12_512(bigdata.dat)= 1d93645ebfbb477660f98b7d1598e37fbf3bfc8234ead26e2246e1b979e590ac46138158a692f9a0c9ac2550758b4d0d4c9fb8af5e595a16d3760c6516443f82\n",
 "GOST R 34.11-2012 512bit 128K");
 
 unlink "bigdata.dat";