From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 7 Jan 2020 17:17:17 +0000 (+0300)
Subject: More 34.10-2012 test vectors
X-Git-Tag: v4.2.2^0
X-Git-Url: http://www.git.cypherpunks.ru/?p=gogost.git;a=commitdiff_plain;h=0335d2a4d23a75de1b62e78cdff79e49b1d39047

More 34.10-2012 test vectors
---

diff --git a/VERSION b/VERSION
index fae6e3d..af8c8ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.1
+4.2.2
diff --git a/gost3410/2012_test.go b/gost3410/2012_test.go
index 4ee6b6f..422ed7c 100644
--- a/gost3410/2012_test.go
+++ b/gost3410/2012_test.go
@@ -19,10 +19,181 @@ import (
 	"bytes"
 	"crypto/rand"
 	"encoding/hex"
+	"math/big"
 	"testing"
 	"testing/quick"
 )
 
+// Test vector from GOST R 34.10-2012 appendix
+func TestStdVector1(t *testing.T) {
+	prvRaw := []byte{
+		0x7A, 0x92, 0x9A, 0xDE, 0x78, 0x9B, 0xB9, 0xBE,
+		0x10, 0xED, 0x35, 0x9D, 0xD3, 0x9A, 0x72, 0xC1,
+		0x1B, 0x60, 0x96, 0x1F, 0x49, 0x39, 0x7E, 0xEE,
+		0x1D, 0x19, 0xCE, 0x98, 0x91, 0xEC, 0x3B, 0x28,
+	}
+	dgst := []byte{
+		0x2D, 0xFB, 0xC1, 0xB3, 0x72, 0xD8, 0x9A, 0x11,
+		0x88, 0xC0, 0x9C, 0x52, 0xE0, 0xEE, 0xC6, 0x1F,
+		0xCE, 0x52, 0x03, 0x2A, 0xB1, 0x02, 0x2E, 0x8E,
+		0x67, 0xEC, 0xE6, 0x67, 0x2B, 0x04, 0x3E, 0xE5,
+	}
+	rnd := []byte{
+		0x77, 0x10, 0x5C, 0x9B, 0x20, 0xBC, 0xD3, 0x12,
+		0x28, 0x23, 0xC8, 0xCF, 0x6F, 0xCC, 0x7B, 0x95,
+		0x6D, 0xE3, 0x38, 0x14, 0xE9, 0x5B, 0x7F, 0xE6,
+		0x4F, 0xED, 0x92, 0x45, 0x94, 0xDC, 0xEA, 0xB3,
+	}
+	r := []byte{
+		0x41, 0xAA, 0x28, 0xD2, 0xF1, 0xAB, 0x14, 0x82,
+		0x80, 0xCD, 0x9E, 0xD5, 0x6F, 0xED, 0xA4, 0x19,
+		0x74, 0x05, 0x35, 0x54, 0xA4, 0x27, 0x67, 0xB8,
+		0x3A, 0xD0, 0x43, 0xFD, 0x39, 0xDC, 0x04, 0x93,
+	}
+	s := []byte{
+		0x01, 0x45, 0x6C, 0x64, 0xBA, 0x46, 0x42, 0xA1,
+		0x65, 0x3C, 0x23, 0x5A, 0x98, 0xA6, 0x02, 0x49,
+		0xBC, 0xD6, 0xD3, 0xF7, 0x46, 0xB6, 0x31, 0xDF,
+		0x92, 0x80, 0x14, 0xF6, 0xC5, 0xBF, 0x9C, 0x40,
+	}
+	reverse(prvRaw)
+	prv, err := NewPrivateKey(CurveIdGostR34102001TestParamSet(), Mode2001, prvRaw)
+	if err != nil {
+		t.FailNow()
+	}
+	sign, err := prv.SignDigest(dgst, bytes.NewBuffer(rnd))
+	if err != nil {
+		t.FailNow()
+	}
+	if bytes.Compare(sign, append(s, r...)) != 0 {
+		t.FailNow()
+	}
+}
+
+// Test vector from GOST R 34.10-2012 appendix
+func TestStdVector2(t *testing.T) {
+	c, err := NewCurve(
+		bytes2big([]byte{
+			0x45, 0x31, 0xAC, 0xD1, 0xFE, 0x00, 0x23, 0xC7,
+			0x55, 0x0D, 0x26, 0x7B, 0x6B, 0x2F, 0xEE, 0x80,
+			0x92, 0x2B, 0x14, 0xB2, 0xFF, 0xB9, 0x0F, 0x04,
+			0xD4, 0xEB, 0x7C, 0x09, 0xB5, 0xD2, 0xD1, 0x5D,
+			0xF1, 0xD8, 0x52, 0x74, 0x1A, 0xF4, 0x70, 0x4A,
+			0x04, 0x58, 0x04, 0x7E, 0x80, 0xE4, 0x54, 0x6D,
+			0x35, 0xB8, 0x33, 0x6F, 0xAC, 0x22, 0x4D, 0xD8,
+			0x16, 0x64, 0xBB, 0xF5, 0x28, 0xBE, 0x63, 0x73,
+		}),
+		bytes2big([]byte{
+			0x45, 0x31, 0xAC, 0xD1, 0xFE, 0x00, 0x23, 0xC7,
+			0x55, 0x0D, 0x26, 0x7B, 0x6B, 0x2F, 0xEE, 0x80,
+			0x92, 0x2B, 0x14, 0xB2, 0xFF, 0xB9, 0x0F, 0x04,
+			0xD4, 0xEB, 0x7C, 0x09, 0xB5, 0xD2, 0xD1, 0x5D,
+			0xA8, 0x2F, 0x2D, 0x7E, 0xCB, 0x1D, 0xBA, 0xC7,
+			0x19, 0x90, 0x5C, 0x5E, 0xEC, 0xC4, 0x23, 0xF1,
+			0xD8, 0x6E, 0x25, 0xED, 0xBE, 0x23, 0xC5, 0x95,
+			0xD6, 0x44, 0xAA, 0xF1, 0x87, 0xE6, 0xE6, 0xDF,
+		}),
+		big.NewInt(7),
+		bytes2big([]byte{
+			0x1C, 0xFF, 0x08, 0x06, 0xA3, 0x11, 0x16, 0xDA,
+			0x29, 0xD8, 0xCF, 0xA5, 0x4E, 0x57, 0xEB, 0x74,
+			0x8B, 0xC5, 0xF3, 0x77, 0xE4, 0x94, 0x00, 0xFD,
+			0xD7, 0x88, 0xB6, 0x49, 0xEC, 0xA1, 0xAC, 0x43,
+			0x61, 0x83, 0x40, 0x13, 0xB2, 0xAD, 0x73, 0x22,
+			0x48, 0x0A, 0x89, 0xCA, 0x58, 0xE0, 0xCF, 0x74,
+			0xBC, 0x9E, 0x54, 0x0C, 0x2A, 0xDD, 0x68, 0x97,
+			0xFA, 0xD0, 0xA3, 0x08, 0x4F, 0x30, 0x2A, 0xDC,
+		}),
+		bytes2big([]byte{
+			0x24, 0xD1, 0x9C, 0xC6, 0x45, 0x72, 0xEE, 0x30,
+			0xF3, 0x96, 0xBF, 0x6E, 0xBB, 0xFD, 0x7A, 0x6C,
+			0x52, 0x13, 0xB3, 0xB3, 0xD7, 0x05, 0x7C, 0xC8,
+			0x25, 0xF9, 0x10, 0x93, 0xA6, 0x8C, 0xD7, 0x62,
+			0xFD, 0x60, 0x61, 0x12, 0x62, 0xCD, 0x83, 0x8D,
+			0xC6, 0xB6, 0x0A, 0xA7, 0xEE, 0xE8, 0x04, 0xE2,
+			0x8B, 0xC8, 0x49, 0x97, 0x7F, 0xAC, 0x33, 0xB4,
+			0xB5, 0x30, 0xF1, 0xB1, 0x20, 0x24, 0x8A, 0x9A,
+		}),
+		bytes2big([]byte{
+			0x2B, 0xB3, 0x12, 0xA4, 0x3B, 0xD2, 0xCE, 0x6E,
+			0x0D, 0x02, 0x06, 0x13, 0xC8, 0x57, 0xAC, 0xDD,
+			0xCF, 0xBF, 0x06, 0x1E, 0x91, 0xE5, 0xF2, 0xC3,
+			0xF3, 0x24, 0x47, 0xC2, 0x59, 0xF3, 0x9B, 0x2C,
+			0x83, 0xAB, 0x15, 0x6D, 0x77, 0xF1, 0x49, 0x6B,
+			0xF7, 0xEB, 0x33, 0x51, 0xE1, 0xEE, 0x4E, 0x43,
+			0xDC, 0x1A, 0x18, 0xB9, 0x1B, 0x24, 0x64, 0x0B,
+			0x6D, 0xBB, 0x92, 0xCB, 0x1A, 0xDD, 0x37, 0x1E,
+		}),
+		nil,
+		nil,
+	)
+	if err != nil {
+		t.FailNow()
+	}
+	prvRaw := []byte{
+		0x0B, 0xA6, 0x04, 0x8A, 0xAD, 0xAE, 0x24, 0x1B,
+		0xA4, 0x09, 0x36, 0xD4, 0x77, 0x56, 0xD7, 0xC9,
+		0x30, 0x91, 0xA0, 0xE8, 0x51, 0x46, 0x69, 0x70,
+		0x0E, 0xE7, 0x50, 0x8E, 0x50, 0x8B, 0x10, 0x20,
+		0x72, 0xE8, 0x12, 0x3B, 0x22, 0x00, 0xA0, 0x56,
+		0x33, 0x22, 0xDA, 0xD2, 0x82, 0x7E, 0x27, 0x14,
+		0xA2, 0x63, 0x6B, 0x7B, 0xFD, 0x18, 0xAA, 0xDF,
+		0xC6, 0x29, 0x67, 0x82, 0x1F, 0xA1, 0x8D, 0xD4,
+	}
+	dgst := []byte{
+		0x37, 0x54, 0xF3, 0xCF, 0xAC, 0xC9, 0xE0, 0x61,
+		0x5C, 0x4F, 0x4A, 0x7C, 0x4D, 0x8D, 0xAB, 0x53,
+		0x1B, 0x09, 0xB6, 0xF9, 0xC1, 0x70, 0xC5, 0x33,
+		0xA7, 0x1D, 0x14, 0x70, 0x35, 0xB0, 0xC5, 0x91,
+		0x71, 0x84, 0xEE, 0x53, 0x65, 0x93, 0xF4, 0x41,
+		0x43, 0x39, 0x97, 0x6C, 0x64, 0x7C, 0x5D, 0x5A,
+		0x40, 0x7A, 0xDE, 0xDB, 0x1D, 0x56, 0x0C, 0x4F,
+		0xC6, 0x77, 0x7D, 0x29, 0x72, 0x07, 0x5B, 0x8C,
+	}
+	rnd := []byte{
+		0x03, 0x59, 0xE7, 0xF4, 0xB1, 0x41, 0x0F, 0xEA,
+		0xCC, 0x57, 0x04, 0x56, 0xC6, 0x80, 0x14, 0x96,
+		0x94, 0x63, 0x12, 0x12, 0x0B, 0x39, 0xD0, 0x19,
+		0xD4, 0x55, 0x98, 0x6E, 0x36, 0x4F, 0x36, 0x58,
+		0x86, 0x74, 0x8E, 0xD7, 0xA4, 0x4B, 0x3E, 0x79,
+		0x44, 0x34, 0x00, 0x60, 0x11, 0x84, 0x22, 0x86,
+		0x21, 0x22, 0x73, 0xA6, 0xD1, 0x4C, 0xF7, 0x0E,
+		0xA3, 0xAF, 0x71, 0xBB, 0x1A, 0xE6, 0x79, 0xF1,
+	}
+	r := []byte{
+		0x2F, 0x86, 0xFA, 0x60, 0xA0, 0x81, 0x09, 0x1A,
+		0x23, 0xDD, 0x79, 0x5E, 0x1E, 0x3C, 0x68, 0x9E,
+		0xE5, 0x12, 0xA3, 0xC8, 0x2E, 0xE0, 0xDC, 0xC2,
+		0x64, 0x3C, 0x78, 0xEE, 0xA8, 0xFC, 0xAC, 0xD3,
+		0x54, 0x92, 0x55, 0x84, 0x86, 0xB2, 0x0F, 0x1C,
+		0x9E, 0xC1, 0x97, 0xC9, 0x06, 0x99, 0x85, 0x02,
+		0x60, 0xC9, 0x3B, 0xCB, 0xCD, 0x9C, 0x5C, 0x33,
+		0x17, 0xE1, 0x93, 0x44, 0xE1, 0x73, 0xAE, 0x36,
+	}
+	s := []byte{
+		0x10, 0x81, 0xB3, 0x94, 0x69, 0x6F, 0xFE, 0x8E,
+		0x65, 0x85, 0xE7, 0xA9, 0x36, 0x2D, 0x26, 0xB6,
+		0x32, 0x5F, 0x56, 0x77, 0x8A, 0xAD, 0xBC, 0x08,
+		0x1C, 0x0B, 0xFB, 0xE9, 0x33, 0xD5, 0x2F, 0xF5,
+		0x82, 0x3C, 0xE2, 0x88, 0xE8, 0xC4, 0xF3, 0x62,
+		0x52, 0x60, 0x80, 0xDF, 0x7F, 0x70, 0xCE, 0x40,
+		0x6A, 0x6E, 0xEB, 0x1F, 0x56, 0x91, 0x9C, 0xB9,
+		0x2A, 0x98, 0x53, 0xBD, 0xE7, 0x3E, 0x5B, 0x4A,
+	}
+	reverse(prvRaw)
+	prv, err := NewPrivateKey(c, Mode2012, prvRaw)
+	if err != nil {
+		t.FailNow()
+	}
+	sign, err := prv.SignDigest(dgst, bytes.NewBuffer(rnd))
+	if err != nil {
+		t.FailNow()
+	}
+	if bytes.Compare(sign, append(s, r...)) != 0 {
+		t.FailNow()
+	}
+}
+
 func TestGCL3Vectors(t *testing.T) {
 	p := []byte{
 		0x45, 0x31, 0xAC, 0xD1, 0xFE, 0x00, 0x23, 0xC7,
diff --git a/install.texi b/install.texi
index 485f5ff..93c181f 100644
--- a/install.texi
+++ b/install.texi
@@ -1,7 +1,7 @@
 @node Download
 @unnumbered Download
 
-@set VERSION 4.2.1
+@set VERSION 4.2.2
 
 Preferable way is to download tarball with the signature from
 website and, for example, run tests with benchmarks:
diff --git a/news.texi b/news.texi
index 6db7489..eb34c76 100644
--- a/news.texi
+++ b/news.texi
@@ -3,6 +3,10 @@
 
 @table @strong
 
+@anchor{Release 4.2.2}
+@item 4.2.2
+    More 34.10-2012 test vectors.
+
 @anchor{Release 4.2.1}
 @item 4.2.1
     Dummy release. More nicer tarballs.