X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgogost%2Fgost3410%2Fparams.go;h=42e40efb5f3699bd5e6b1af52a6b3362fbaad6b6;hb=e6f47a8e2a1c2a9d800901c251424617f5cb332d;hp=dbf3040de980edb13b8da32824fec761ab5aad26;hpb=64f9decbd53306c271661bf70a232963f75365a3;p=gogost.git

diff --git a/src/cypherpunks.ru/gogost/gost3410/params.go b/src/cypherpunks.ru/gogost/gost3410/params.go
index dbf3040..42e40ef 100644
--- a/src/cypherpunks.ru/gogost/gost3410/params.go
+++ b/src/cypherpunks.ru/gogost/gost3410/params.go
@@ -24,6 +24,7 @@ var (
 
 	CurveGostR34102001ParamSetcc func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"GostR34102001ParamSetcc",
 			bytes2big([]byte{
 				0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -60,6 +61,8 @@ var (
 				0xeb, 0x24, 0x8b, 0x26, 0x4a, 0xe9, 0x70, 0x6f,
 				0x44, 0x0b, 0xed, 0xc8, 0xcc, 0xb6, 0xb2, 0x2c,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -69,6 +72,7 @@ var (
 	// id-GostR3410-2001-TestParamSet
 	CurveIdGostR34102001TestParamSet func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-GostR3410-2001-TestParamSet",
 			bytes2big([]byte{
 				0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -105,6 +109,8 @@ var (
 				0x85, 0xC9, 0x7F, 0x0A, 0x9C, 0xA2, 0x67, 0x12,
 				0x2B, 0x96, 0xAB, 0xBC, 0xEA, 0x7E, 0x8F, 0xC8,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -114,6 +120,7 @@ var (
 	// id-GostR3410-2001-CryptoPro-A-ParamSet
 	CurveIdGostR34102001CryptoProAParamSet func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-GostR3410-2001-CryptoPro-A-ParamSet",
 			bytes2big([]byte{
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -150,6 +157,8 @@ var (
 				0x35, 0x29, 0x4F, 0x2D, 0xDF, 0x23, 0xE3, 0xB1,
 				0x22, 0xAC, 0xC9, 0x9C, 0x9E, 0x9F, 0x1E, 0x14,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -159,6 +168,7 @@ var (
 	// id-GostR3410-2001-CryptoPro-B-ParamSet
 	CurveIdGostR34102001CryptoProBParamSet func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-GostR3410-2001-CryptoPro-B-ParamSet",
 			bytes2big([]byte{
 				0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -195,6 +205,8 @@ var (
 				0xC5, 0x45, 0xC9, 0x85, 0x8D, 0x03, 0xEC, 0xFB,
 				0x74, 0x4B, 0xF8, 0xD7, 0x17, 0x71, 0x7E, 0xFC,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -204,6 +216,7 @@ var (
 	// id-GostR3410-2001-CryptoPro-C-ParamSet
 	CurveIdGostR34102001CryptoProCParamSet func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-GostR3410-2001-CryptoPro-C-ParamSet",
 			bytes2big([]byte{
 				0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
 				0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
@@ -240,6 +253,8 @@ var (
 				0x4D, 0x4D, 0xC4, 0x40, 0xD4, 0x64, 0x1A, 0x8F,
 				0x36, 0x6E, 0x55, 0x0D, 0xFD, 0xB3, 0xBB, 0x67,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -247,98 +262,13 @@ var (
 		return curve
 	}
 	// id-GostR3410-2001-CryptoPro-XchA-ParamSet
-	CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = func() *Curve {
-		curve, err := NewCurve(
-			bytes2big([]byte{
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x97,
-			}),
-			bytes2big([]byte{
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0x6C, 0x61, 0x10, 0x70, 0x99, 0x5A, 0xD1, 0x00,
-				0x45, 0x84, 0x1B, 0x09, 0xB7, 0x61, 0xB8, 0x93,
-			}),
-			bytes2big([]byte{
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0x94,
-			}),
-			bytes2big([]byte{
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa6,
-			}),
-			bytes2big([]byte{
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-			}),
-			bytes2big([]byte{
-				0x8D, 0x91, 0xE4, 0x71, 0xE0, 0x98, 0x9C, 0xDA,
-				0x27, 0xDF, 0x50, 0x5A, 0x45, 0x3F, 0x2B, 0x76,
-				0x35, 0x29, 0x4F, 0x2D, 0xDF, 0x23, 0xE3, 0xB1,
-				0x22, 0xAC, 0xC9, 0x9C, 0x9E, 0x9F, 0x1E, 0x14,
-			}),
-		)
-		if err != nil {
-			panic(err)
-		}
-		return curve
-	}
+	CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = CurveIdGostR34102001CryptoProAParamSet
 	// id-GostR3410-2001-CryptoPro-XchB-ParamSet
-	CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = func() *Curve {
-		curve, err := NewCurve(
-			bytes2big([]byte{
-				0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
-				0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
-				0xCF, 0x84, 0x6E, 0x86, 0x78, 0x90, 0x51, 0xD3,
-				0x79, 0x98, 0xF7, 0xB9, 0x02, 0x2D, 0x75, 0x9B,
-			}),
-			bytes2big([]byte{
-				0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
-				0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
-				0x58, 0x2C, 0xA3, 0x51, 0x1E, 0xDD, 0xFB, 0x74,
-				0xF0, 0x2F, 0x3A, 0x65, 0x98, 0x98, 0x0B, 0xB9,
-			}),
-			bytes2big([]byte{
-				0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
-				0xAB, 0x1E, 0xC8, 0x5E, 0x6B, 0x41, 0xC8, 0xAA,
-				0xCF, 0x84, 0x6E, 0x86, 0x78, 0x90, 0x51, 0xD3,
-				0x79, 0x98, 0xF7, 0xB9, 0x02, 0x2D, 0x75, 0x98,
-			}),
-			bytes2big([]byte{
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x5a,
-			}),
-			bytes2big([]byte{
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			}),
-			bytes2big([]byte{
-				0x41, 0xEC, 0xE5, 0x57, 0x43, 0x71, 0x1A, 0x8C,
-				0x3C, 0xBF, 0x37, 0x83, 0xCD, 0x08, 0xC0, 0xEE,
-				0x4D, 0x4D, 0xC4, 0x40, 0xD4, 0x64, 0x1A, 0x8F,
-				0x36, 0x6E, 0x55, 0x0D, 0xFD, 0xB3, 0xBB, 0x67,
-			}),
-		)
-		if err != nil {
-			panic(err)
-		}
-		return curve
-	}
+	CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = CurveIdGostR34102001CryptoProCParamSet
 	// id-tc26-gost-3410-2012-256-paramSetA
 	CurveIdtc26gost34102012256paramSetA func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-tc26-gost-3410-2012-256-paramSetA",
 			bytes2big([]byte{
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -375,15 +305,29 @@ var (
 				0x5F, 0xDE, 0x0B, 0x53, 0x44, 0x76, 0x67, 0x40,
 				0xAF, 0x26, 0x8A, 0xDB, 0x32, 0x32, 0x2E, 0x5C,
 			}),
+			bigInt1,
+			bytes2big([]byte{
+				0x06, 0x05, 0xF6, 0xB7, 0xC1, 0x83, 0xFA, 0x81,
+				0x57, 0x8B, 0xC3, 0x9C, 0xFA, 0xD5, 0x18, 0x13,
+				0x2B, 0x9D, 0xF6, 0x28, 0x97, 0x00, 0x9A, 0xF7,
+				0xE5, 0x22, 0xC3, 0x2D, 0x6D, 0xC7, 0xBF, 0xFB,
+			}),
 		)
 		if err != nil {
 			panic(err)
 		}
 		return curve
 	}
+	// id-tc26-gost-3410-2012-256-paramSetB
+	CurveIdtc26gost34102012256paramSetB func() *Curve = CurveIdGostR34102001CryptoProAParamSet
+	// id-tc26-gost-3410-2012-256-paramSetC
+	CurveIdtc26gost34102012256paramSetC func() *Curve = CurveIdGostR34102001CryptoProBParamSet
+	// id-tc26-gost-3410-2012-256-paramSetD
+	CurveIdtc26gost34102012256paramSetD func() *Curve = CurveIdGostR34102001CryptoProCParamSet
 	// id-tc26-gost-3410-12-512-paramSetA
 	CurveIdtc26gost341012512paramSetA func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-tc26-gost-3410-12-512-paramSetA",
 			bytes2big([]byte{
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -444,6 +388,8 @@ var (
 				0x80, 0x28, 0xFE, 0x5F, 0xC2, 0x35, 0xF5, 0xB8,
 				0x89, 0xA5, 0x89, 0xCB, 0x52, 0x15, 0xF2, 0xA4,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -453,6 +399,7 @@ var (
 	// id-tc26-gost-3410-12-512-paramSetB
 	CurveIdtc26gost341012512paramSetB func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-tc26-gost-3410-12-512-paramSetB",
 			bytes2big([]byte{
 				0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -513,6 +460,8 @@ var (
 				0x28, 0x04, 0x10, 0x55, 0xF9, 0x4C, 0xEE, 0xEC,
 				0x7E, 0x21, 0x34, 0x07, 0x80, 0xFE, 0x41, 0xBD,
 			}),
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
@@ -522,6 +471,7 @@ var (
 	// id-tc26-gost-3410-2012-512-paramSetC
 	CurveIdtc26gost34102012512paramSetC func() *Curve = func() *Curve {
 		curve, err := NewCurve(
+			"id-tc26-gost-3410-2012-512-paramSetC",
 			bytes2big([]byte{
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -582,6 +532,16 @@ var (
 				0x04, 0xF7, 0x26, 0xAA, 0x85, 0x4B, 0xAE, 0x07,
 				0xD0, 0x39, 0x6E, 0x9A, 0x9A, 0xDD, 0xC4, 0x0F,
 			}),
+			bigInt1,
+			bytes2big([]byte{
+				0x9E, 0x4F, 0x5D, 0x8C, 0x01, 0x7D, 0x8D, 0x9F,
+				0x13, 0xA5, 0xCF, 0x3C, 0xDF, 0x5B, 0xFE, 0x4D,
+				0xAB, 0x40, 0x2D, 0x54, 0x19, 0x8E, 0x31, 0xEB,
+				0xDE, 0x28, 0xA0, 0x62, 0x10, 0x50, 0x43, 0x9C,
+				0xA6, 0xB3, 0x9E, 0x0A, 0x51, 0x5C, 0x06, 0xB3,
+				0x04, 0xE2, 0xCE, 0x43, 0xE7, 0x9E, 0x36, 0x9E,
+				0x91, 0xA0, 0xCF, 0xC2, 0xBC, 0x2A, 0x22, 0xB4,
+				0xCA, 0x30, 0x2D, 0xBB, 0x33, 0xEE, 0x75, 0x50,
 			}),
 		)
 		if err != nil {