From ba463d8af0cdec8b8c4747969e19c155dfa61008 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 2 Apr 2021 15:24:10 +0300
Subject: [PATCH] CurveIdtc26gost341012512paramSetTest and various curve
 aliases

---
 README             |   2 +-
 gogost.go          |   2 +-
 gost3410/params.go | 293 +++++++++++++++++++++++++++++++--------------
 news.texi          |  22 ++++
 www.texi           |   2 +-
 5 files changed, 230 insertions(+), 91 deletions(-)

diff --git a/README b/README
index 269e6d3..35d2785 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ Example 34.10-2012-256 keypair generation, signing and verifying:
         hasher := gost34112012256.New()
         _, err := hasher.Write(data)
         dgst := hasher.Sum(nil)
-        curve := gost3410.CurveIdtc26gost34102012256paramSetB()
+        curve := gost3410.CurveIdtc26gost341012256paramSetB()
         prvRaw := make([]byte, int(32))
         _, err = io.ReadFull(rand.Reader, prvRaw)
         prv, err := gost3410.NewPrivateKey(curve, prvRaw)
diff --git a/gogost.go b/gogost.go
index 7b90a3b..068a449 100644
--- a/gogost.go
+++ b/gogost.go
@@ -1,4 +1,4 @@
 // Pure Go GOST cryptographic functions library.
 package gogost
 
-const Version = "5.5.0"
+const Version = "5.6.0"
diff --git a/gost3410/params.go b/gost3410/params.go
index 426a0ce..6db4c67 100644
--- a/gost3410/params.go
+++ b/gost3410/params.go
@@ -15,6 +15,8 @@
 
 package gost3410
 
+import "math/big"
+
 var (
 	CurveGostR34102001ParamSetcc func() *Curve = func() *Curve {
 		curve, err := NewCurve(
@@ -113,8 +115,62 @@ var (
 		curve.Name = "id-GostR3410-2001-TestParamSet"
 		return curve
 	}
-	// id-GostR3410-2001-CryptoPro-A-ParamSet
-	CurveIdGostR34102001CryptoProAParamSet func() *Curve = func() *Curve {
+	// id-tc26-gost-3410-12-256-paramSetA
+	CurveIdtc26gost341012256paramSetA 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{
+				0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x0F, 0xD8, 0xCD, 0xDF, 0xC8, 0x7B, 0x66, 0x35,
+				0xC1, 0x15, 0xAF, 0x55, 0x6C, 0x36, 0x0C, 0x67,
+			}),
+			bytes2big([]byte{
+				0xC2, 0x17, 0x3F, 0x15, 0x13, 0x98, 0x16, 0x73,
+				0xAF, 0x48, 0x92, 0xC2, 0x30, 0x35, 0xA2, 0x7C,
+				0xE2, 0x5E, 0x20, 0x13, 0xBF, 0x95, 0xAA, 0x33,
+				0xB2, 0x2C, 0x65, 0x6F, 0x27, 0x7E, 0x73, 0x35,
+			}),
+			bytes2big([]byte{
+				0x29, 0x5F, 0x9B, 0xAE, 0x74, 0x28, 0xED, 0x9C,
+				0xCC, 0x20, 0xE7, 0xC3, 0x59, 0xA9, 0xD4, 0x1A,
+				0x22, 0xFC, 0xCD, 0x91, 0x08, 0xE1, 0x7B, 0xF7,
+				0xBA, 0x93, 0x37, 0xA6, 0xF8, 0xAE, 0x95, 0x13,
+			}),
+			bytes2big([]byte{
+				0x91, 0xE3, 0x84, 0x43, 0xA5, 0xE8, 0x2C, 0x0D,
+				0x88, 0x09, 0x23, 0x42, 0x57, 0x12, 0xB2, 0xBB,
+				0x65, 0x8B, 0x91, 0x96, 0x93, 0x2E, 0x02, 0xC7,
+				0x8B, 0x25, 0x82, 0xFE, 0x74, 0x2D, 0xAA, 0x28,
+			}),
+			bytes2big([]byte{
+				0x32, 0x87, 0x94, 0x23, 0xAB, 0x1A, 0x03, 0x75,
+				0x89, 0x57, 0x86, 0xC4, 0xBB, 0x46, 0xE9, 0x56,
+				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,
+			}),
+			bigInt4,
+		)
+		if err != nil {
+			panic(err)
+		}
+		curve.Name = "id-tc26-gost-3410-12-256-paramSetA"
+		return curve
+	}
+	// id-tc26-gost-3410-12-256-paramSetB
+	CurveIdtc26gost341012256paramSetB func() *Curve = func() *Curve {
 		curve, err := NewCurve(
 			bytes2big([]byte{
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -159,11 +215,11 @@ var (
 		if err != nil {
 			panic(err)
 		}
-		curve.Name = "id-GostR3410-2001-CryptoPro-A-ParamSet"
+		curve.Name = "id-tc26-gost-3410-12-256-paramSetB"
 		return curve
 	}
-	// id-GostR3410-2001-CryptoPro-B-ParamSet
-	CurveIdGostR34102001CryptoProBParamSet func() *Curve = func() *Curve {
+	// id-tc26-gost-3410-12-256-paramSetC
+	CurveIdtc26gost341012256paramSetC func() *Curve = func() *Curve {
 		curve, err := NewCurve(
 			bytes2big([]byte{
 				0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -208,11 +264,11 @@ var (
 		if err != nil {
 			panic(err)
 		}
-		curve.Name = "id-GostR3410-2001-CryptoPro-B-ParamSet"
+		curve.Name = "id-tc26-gost-3410-12-256-paramSetC"
 		return curve
 	}
-	// id-GostR3410-2001-CryptoPro-C-ParamSet
-	CurveIdGostR34102001CryptoProCParamSet func() *Curve = func() *Curve {
+	// id-tc26-gost-3410-12-256-paramSetD
+	CurveIdtc26gost341012256paramSetD func() *Curve = func() *Curve {
 		curve, err := NewCurve(
 			bytes2big([]byte{
 				0x9B, 0x9F, 0x60, 0x5F, 0x5A, 0x85, 0x81, 0x07,
@@ -257,93 +313,73 @@ var (
 		if err != nil {
 			panic(err)
 		}
-		curve.Name = "id-GostR3410-2001-CryptoPro-C-ParamSet"
+		curve.Name = "id-tc26-gost-3410-12-256-paramSetD"
 		return curve
 	}
-	// id-GostR3410-2001-CryptoPro-XchA-ParamSet
-	CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = func() *Curve {
-		c := CurveIdGostR34102001CryptoProAParamSet()
-		c.Name = "id-GostR3410-2001-CryptoPro-XchA-ParamSet"
-		return c
-	}
-	// id-GostR3410-2001-CryptoPro-XchB-ParamSet
-	CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = func() *Curve {
-		c := CurveIdGostR34102001CryptoProCParamSet()
-		c.Name = "id-GostR3410-2001-CryptoPro-XchB-ParamSet"
-		return c
-	}
-	// id-tc26-gost-3410-2012-256-paramSetA
-	CurveIdtc26gost34102012256paramSetA func() *Curve = func() *Curve {
+	// id-tc26-gost-3410-12-512-paramSetTest
+	CurveIdtc26gost341012512paramSetTest 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{
-				0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x0F, 0xD8, 0xCD, 0xDF, 0xC8, 0x7B, 0x66, 0x35,
-				0xC1, 0x15, 0xAF, 0x55, 0x6C, 0x36, 0x0C, 0x67,
-			}),
-			bytes2big([]byte{
-				0xC2, 0x17, 0x3F, 0x15, 0x13, 0x98, 0x16, 0x73,
-				0xAF, 0x48, 0x92, 0xC2, 0x30, 0x35, 0xA2, 0x7C,
-				0xE2, 0x5E, 0x20, 0x13, 0xBF, 0x95, 0xAA, 0x33,
-				0xB2, 0x2C, 0x65, 0x6F, 0x27, 0x7E, 0x73, 0x35,
-			}),
-			bytes2big([]byte{
-				0x29, 0x5F, 0x9B, 0xAE, 0x74, 0x28, 0xED, 0x9C,
-				0xCC, 0x20, 0xE7, 0xC3, 0x59, 0xA9, 0xD4, 0x1A,
-				0x22, 0xFC, 0xCD, 0x91, 0x08, 0xE1, 0x7B, 0xF7,
-				0xBA, 0x93, 0x37, 0xA6, 0xF8, 0xAE, 0x95, 0x13,
+				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,
 			}),
-			bytes2big([]byte{
-				0x91, 0xE3, 0x84, 0x43, 0xA5, 0xE8, 0x2C, 0x0D,
-				0x88, 0x09, 0x23, 0x42, 0x57, 0x12, 0xB2, 0xBB,
-				0x65, 0x8B, 0x91, 0x96, 0x93, 0x2E, 0x02, 0xC7,
-				0x8B, 0x25, 0x82, 0xFE, 0x74, 0x2D, 0xAA, 0x28,
-			}),
-			bytes2big([]byte{
-				0x32, 0x87, 0x94, 0x23, 0xAB, 0x1A, 0x03, 0x75,
-				0x89, 0x57, 0x86, 0xC4, 0xBB, 0x46, 0xE9, 0x56,
-				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,
-			}),
-			bigInt4,
+			nil,
+			nil,
+			nil,
 		)
 		if err != nil {
 			panic(err)
 		}
-		curve.Name = "id-tc26-gost-3410-2012-256-paramSetA"
+		curve.Name = "id-tc26-gost-3410-12-512-paramSetTest"
 		return curve
 	}
-	// id-tc26-gost-3410-2012-256-paramSetB
-	CurveIdtc26gost34102012256paramSetB func() *Curve = func() *Curve {
-		c := CurveIdGostR34102001CryptoProAParamSet()
-		c.Name = "id-tc26-gost-3410-2012-256-paramSetB"
-		return c
-	}
-	// id-tc26-gost-3410-2012-256-paramSetC
-	CurveIdtc26gost34102012256paramSetC func() *Curve = func() *Curve {
-		c := CurveIdGostR34102001CryptoProBParamSet()
-		c.Name = "id-tc26-gost-3410-2012-256-paramSetC"
-		return c
-	}
-	// id-tc26-gost-3410-2012-256-paramSetD
-	CurveIdtc26gost34102012256paramSetD func() *Curve = func() *Curve {
-		c := CurveIdGostR34102001CryptoProCParamSet()
-		c.Name = "id-tc26-gost-3410-2012-256-paramSetD"
-		return c
-	}
 	// id-tc26-gost-3410-12-512-paramSetA
 	CurveIdtc26gost341012512paramSetA func() *Curve = func() *Curve {
 		curve, err := NewCurve(
@@ -490,8 +526,8 @@ var (
 		curve.Name = "id-tc26-gost-3410-12-512-paramSetB"
 		return curve
 	}
-	// id-tc26-gost-3410-2012-512-paramSetC
-	CurveIdtc26gost34102012512paramSetC func() *Curve = func() *Curve {
+	// id-tc26-gost-3410-12-512-paramSetC
+	CurveIdtc26gost341012512paramSetC func() *Curve = func() *Curve {
 		curve, err := NewCurve(
 			bytes2big([]byte{
 				0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -569,9 +605,90 @@ var (
 		if err != nil {
 			panic(err)
 		}
-		curve.Name = "id-tc26-gost-3410-2012-512-paramSetC"
+		curve.Name = "id-tc26-gost-3410-12-512-paramSetC"
 		return curve
 	}
 
-	CurveDefault = CurveIdGostR34102001CryptoProAParamSet
+	// Aliases
+
+	// id-GostR3410-2001-CryptoPro-A-ParamSet
+	CurveIdGostR34102001CryptoProAParamSet func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetB()
+		c.Name = "id-GostR3410-2001-CryptoPro-A-ParamSet"
+		return c
+	}
+	// id-GostR3410-2001-CryptoPro-B-ParamSet
+	CurveIdGostR34102001CryptoProBParamSet func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetC()
+		c.Name = "id-GostR3410-2001-CryptoPro-B-ParamSet"
+		return c
+	}
+	// id-GostR3410-2001-CryptoPro-C-ParamSet
+	CurveIdGostR34102001CryptoProCParamSet func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetD()
+		c.Name = "id-GostR3410-2001-CryptoPro-C-ParamSet"
+		return c
+	}
+	// id-GostR3410-2001-CryptoPro-XchA-ParamSet
+	CurveIdGostR34102001CryptoProXchAParamSet func() *Curve = func() *Curve {
+		c := CurveIdGostR34102001CryptoProAParamSet()
+		c.Name = "id-GostR3410-2001-CryptoPro-XchA-ParamSet"
+		return c
+	}
+	// id-GostR3410-2001-CryptoPro-XchB-ParamSet
+	CurveIdGostR34102001CryptoProXchBParamSet func() *Curve = func() *Curve {
+		c := CurveIdGostR34102001CryptoProCParamSet()
+		c.Name = "id-GostR3410-2001-CryptoPro-XchB-ParamSet"
+		return c
+	}
+	// id-tc26-gost-3410-2012-256-paramSetA
+	CurveIdtc26gost34102012256paramSetA func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetA()
+		c.Name = "id-tc26-gost-3410-2012-256-paramSetA"
+		return c
+	}
+	// id-tc26-gost-3410-2012-256-paramSetB
+	CurveIdtc26gost34102012256paramSetB func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetB()
+		c.Name = "id-tc26-gost-3410-2012-256-paramSetB"
+		return c
+	}
+	// id-tc26-gost-3410-2012-256-paramSetC
+	CurveIdtc26gost34102012256paramSetC func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetC()
+		c.Name = "id-tc26-gost-3410-2012-256-paramSetC"
+		return c
+	}
+	// id-tc26-gost-3410-2012-256-paramSetD
+	CurveIdtc26gost34102012256paramSetD func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012256paramSetD()
+		c.Name = "id-tc26-gost-3410-2012-256-paramSetD"
+		return c
+	}
+	// id-tc26-gost-3410-2012-512-paramSetTest
+	CurveIdtc26gost34102012512paramSetTest func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012512paramSetTest()
+		c.Name = "id-tc26-gost-3410-2012-512-paramSetTest"
+		return c
+	}
+	// id-tc26-gost-3410-2012-512-paramSetA
+	CurveIdtc26gost34102012512paramSetA func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012512paramSetA()
+		c.Name = "id-tc26-gost-3410-2012-512-paramSetA"
+		return c
+	}
+	// id-tc26-gost-3410-2012-512-paramSetB
+	CurveIdtc26gost34102012512paramSetB func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012512paramSetB()
+		c.Name = "id-tc26-gost-3410-2012-512-paramSetB"
+		return c
+	}
+	// id-tc26-gost-3410-2012-512-paramSetC
+	CurveIdtc26gost34102012512paramSetC func() *Curve = func() *Curve {
+		c := CurveIdtc26gost341012512paramSetC()
+		c.Name = "id-tc26-gost-3410-2012-512-paramSetC"
+		return c
+	}
+
+	CurveDefault = CurveIdtc26gost341012256paramSetB
 )
diff --git a/news.texi b/news.texi
index 919168c..a5aabeb 100644
--- a/news.texi
+++ b/news.texi
@@ -3,6 +3,28 @@
 
 @table @strong
 
+@anchor{Release 5.6.0}
+@item 5.6.0
+    @itemize
+    @item Add @code{gost3410.CurveIdtc26gost341012512paramSetTest} curve
+    @item More curve aliases:
+@verbatim
+CurveIdGostR34102001CryptoProAParamSet -> CurveIdtc26gost341012256paramSetB
+CurveIdGostR34102001CryptoProBParamSet -> CurveIdtc26gost341012256paramSetC
+CurveIdGostR34102001CryptoProCParamSet -> CurveIdtc26gost341012256paramSetD
+CurveIdGostR34102001CryptoProXchAParamSet -> CurveIdGostR34102001CryptoProAParamSet
+CurveIdGostR34102001CryptoProXchBParamSet -> CurveIdGostR34102001CryptoProCParamSet
+CurveIdtc26gost34102012256paramSetA -> CurveIdtc26gost341012256paramSetA
+CurveIdtc26gost34102012256paramSetB -> CurveIdtc26gost341012256paramSetB
+CurveIdtc26gost34102012256paramSetC -> CurveIdtc26gost341012256paramSetC
+CurveIdtc26gost34102012256paramSetD -> CurveIdtc26gost341012256paramSetD
+CurveIdtc26gost34102012512paramSetTest -> CurveIdtc26gost341012512paramSetTest
+CurveIdtc26gost34102012512paramSetA -> CurveIdtc26gost341012512paramSetA
+CurveIdtc26gost34102012512paramSetB -> CurveIdtc26gost341012512paramSetB
+CurveIdtc26gost34102012512paramSetC -> CurveIdtc26gost341012512paramSetC
+@end verbatim
+    @end itemize
+
 @anchor{Release 5.5.0}
 @item 5.5.0
     @code{gost3410.PrivateKey} is in @code{gost3410.Curve.Q} now. That
diff --git a/www.texi b/www.texi
index d356ff9..07d4a62 100644
--- a/www.texi
+++ b/www.texi
@@ -73,7 +73,7 @@ func main() {
     hasher := gost34112012256.New()
     _, err := hasher.Write(data)
     dgst := hasher.Sum(nil)
-    curve := gost3410.CurveIdtc26gost34102012256paramSetB()
+    curve := gost3410.CurveIdtc26gost341012256paramSetB()
     prvRaw := make([]byte, 32)
     _, err = io.ReadFull(rand.Reader, prvRaw)
     prv, err := gost3410.NewPrivateKey(curve, prvRaw)
-- 
2.44.0