Use curve's cofactor during VKO calculations

[pygost.git] / pygost / gost3410.py

diff --git a/pygost/gost3410.py b/pygost/gost3410.py
index 1848ef56653d21460f1ccf247d6c22ea8c770e9d..9f0a11e656689745056b8f7c53cdf5c3779201b3 100644 (file)
--- a/pygost/gost3410.py
+++ b/pygost/gost3410.py
@@ -54,13 +54,14 @@ class GOST3410Curve(object):
     :param long e, d: coefficients of the equation of the elliptic curve in
                       the twisted Edwards form
     """
-    def __init__(self, p, q, a, b, x, y, e=None, d=None):
+    def __init__(self, p, q, a, b, x, y, cofactor=1, e=None, d=None):
         self.p = p
         self.q = q
         self.a = a
         self.b = b
         self.x = x
         self.y = y
+        self.cofactor = cofactor
         self.e = e
         self.d = d
         r1 = self.y * self.y % self.p
@@ -165,9 +166,18 @@ CURVES = {
         b=bytes2long(hexdec("295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513")),
         x=bytes2long(hexdec("91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28")),
         y=bytes2long(hexdec("32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C")),
+        cofactor=4,
         e=0x01,
         d=bytes2long(hexdec("0605F6B7C183FA81578BC39CFAD518132B9DF62897009AF7E522C32D6DC7BFFB")),
     ),
+    "id-tc26-gost-3410-2012-512-paramSetTest": GOST3410Curve(
+        p=bytes2long(hexdec("4531ACD1FE0023C7550D267B6B2FEE80922B14B2FFB90F04D4EB7C09B5D2D15DF1D852741AF4704A0458047E80E4546D35B8336FAC224DD81664BBF528BE6373")),
+        q=bytes2long(hexdec("4531ACD1FE0023C7550D267B6B2FEE80922B14B2FFB90F04D4EB7C09B5D2D15DA82F2D7ECB1DBAC719905C5EECC423F1D86E25EDBE23C595D644AAF187E6E6DF")),
+        a=7,
+        b=bytes2long(hexdec("1CFF0806A31116DA29D8CFA54E57EB748BC5F377E49400FDD788B649ECA1AC4361834013B2AD7322480A89CA58E0CF74BC9E540C2ADD6897FAD0A3084F302ADC")),
+        x=bytes2long(hexdec("24D19CC64572EE30F396BF6EBBFD7A6C5213B3B3D7057CC825F91093A68CD762FD60611262CD838DC6B60AA7EEE804E28BC849977FAC33B4B530F1B120248A9A")),
+        y=bytes2long(hexdec("2BB312A43BD2CE6E0D020613C857ACDDCFBF061E91E5F2C3F32447C259F39B2C83AB156D77F1496BF7EB3351E1EE4E43DC1A18B91B24640B6DBB92CB1ADD371E")),
+    ),
     "id-tc26-gost-3410-12-512-paramSetA": GOST3410Curve(
         p=bytes2long(hexdec("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7")),
         q=bytes2long(hexdec("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275")),
@@ -191,6 +201,7 @@ CURVES = {
         b=bytes2long(hexdec("B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1")),
         x=bytes2long(hexdec("E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148")),
         y=bytes2long(hexdec("F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F")),
+        cofactor=4,
         e=0x01,
         d=bytes2long(hexdec("9E4F5D8C017D8D9F13A5CF3CDF5BFE4DAB402D54198E31EBDE28A0621050439CA6B39E0A515C06B304E2CE43E79E369E91A0CFC2BC2A22B4CA302DBB33EE7550")),
     ),
@@ -223,7 +234,7 @@ def sign(curve, prv, digest, rand=None, mode=2001):
     :type digest: bytes, 32 or 64 bytes
     :param rand: optional predefined random data used for k/r generation
     :type rand: bytes, 32 or 64 bytes
-    :returns: signature
+    :returns: signature, BE(S) || BE(R)
     :rtype: bytes, 64 or 128 bytes
     """
     size = MODE2SIZE[mode]
@@ -297,7 +308,7 @@ def verify(curve, pub, digest, signature, mode=2001):
 
 
 def prv_unmarshal(prv):
-    """Unmarshal private key
+    """Unmarshal little-endian private key
 
     :param bytes prv: serialized private key
     :rtype: long
@@ -310,6 +321,7 @@ def pub_marshal(pub, mode=2001):
 
     :type pub: (long, long)
     :rtype: bytes
+    :returns: LE(X) || LE(Y)
     """
     size = MODE2SIZE[mode]
     return (long2bytes(pub[1], size) + long2bytes(pub[0], size))[::-1]
@@ -318,6 +330,7 @@ def pub_marshal(pub, mode=2001):
 def pub_unmarshal(pub, mode=2001):
     """Unmarshal public key
 
+    :param pub: LE(X) || LE(Y)
     :type pub: bytes
     :rtype: (long, long)
     """