X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pygost%2Fgost3410.py;h=88cbfbe3493742e003cc6d9149c93739909207db;hb=9af4461c6af50f9cf83030867e7054d1f6311b32;hp=a6b1a7eab87e4ce492dc8392285175b007575291;hpb=a2b4808f6628225be99874bd5f6a0f80a514db82;p=pygost.git diff --git a/pygost/gost3410.py b/pygost/gost3410.py index a6b1a7e..88cbfbe 100644 --- a/pygost/gost3410.py +++ b/pygost/gost3410.py @@ -1,6 +1,6 @@ # coding: utf-8 # PyGOST -- Pure Python GOST cryptographic functions library -# Copyright (C) 2015-2020 Sergey Matveev +# Copyright (C) 2015-2021 Sergey Matveev # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -""" GOST R 34.10 public-key signature function. +"""GOST R 34.10 public-key signature function. This is implementation of GOST R 34.10-2001 (:rfc:`5832`), GOST R 34.10-2012 (:rfc:`7091`). The difference between 2001 and 2012 is the @@ -28,14 +28,14 @@ from pygost.utils import long2bytes from pygost.utils import modinvert -MODE2SIZE = { - 2001: 32, - 2012: 64, -} +def point_size(point): + """Determine is it either 256 or 512 bit point + """ + return (512 // 8) if point.bit_length() > 256 else (256 // 8) class GOST3410Curve(object): - """ GOST 34.10 validated curve + """GOST 34.10 validated curve >>> curve = CURVES["id-GostR3410-2001-TestParamSet"] >>> prv = prv_unmarshal(urandom(32)) @@ -54,21 +54,24 @@ 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 - r2 = ((self.x * self.x + self.a) * self.x + self.b) % self.p - if r1 != self.pos(r2): + if not self.contains((x, y)): raise ValueError("Invalid parameters") self._st = None + @property + def point_size(self): + return point_size(self.p) + def pos(self, v): """Make positive number """ @@ -76,6 +79,16 @@ class GOST3410Curve(object): return v + self.p return v + def contains(self, point): + """Is point on the curve? + + :type point: (long, long) + """ + x, y = point + r1 = y * y % self.p + r2 = ((x * x + self.a) * x + self.b) % self.p + return r1 == self.pos(r2) + def _add(self, p1x, p1y, p2x, p2y): if p1x == p2x and p1y == p2y: # double @@ -107,7 +120,7 @@ class GOST3410Curve(object): """Compute s/t parameters for twisted Edwards curve points conversion """ if self.e is None or self.d is None: - raise ValueError("non twisted Edwards curve") + raise ValueError("Non twisted Edwards curve") if self._st is not None: return self._st self._st = ( @@ -165,9 +178,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 +213,7 @@ CURVES = { b=bytes2long(hexdec("B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1")), x=bytes2long(hexdec("E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148")), y=bytes2long(hexdec("F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F")), + cofactor=4, e=0x01, d=bytes2long(hexdec("9E4F5D8C017D8D9F13A5CF3CDF5BFE4DAB402D54198E31EBDE28A0621050439CA6B39E0A515C06B304E2CE43E79E369E91A0CFC2BC2A22B4CA302DBB33EE7550")), ), @@ -204,7 +227,7 @@ DEFAULT_CURVE = CURVES["id-GostR3410-2001-CryptoPro-A-ParamSet"] def public_key(curve, prv): - """ Generate public key from the private one + """Generate public key from the private one :param GOST3410Curve curve: curve to use :param long prv: private key @@ -214,23 +237,29 @@ def public_key(curve, prv): return curve.exp(prv) -def sign(curve, prv, digest, mode=2001): - """ Calculate signature for provided digest +def sign(curve, prv, digest, rand=None): + """Calculate signature for provided digest :param GOST3410Curve curve: curve to use :param long prv: private key :param digest: digest for signing :type digest: bytes, 32 or 64 bytes - :returns: signature + :param rand: optional predefined random data used for k/r generation + :type rand: bytes, 32 or 64 bytes + :returns: signature, BE(S) || BE(R) :rtype: bytes, 64 or 128 bytes """ - size = MODE2SIZE[mode] + size = curve.point_size q = curve.q e = bytes2long(digest) % q if e == 0: e = 1 while True: - k = bytes2long(urandom(size)) % q + if rand is None: + rand = urandom(size) + elif len(rand) != size: + raise ValueError("rand length != %d" % size) + k = bytes2long(rand) % q if k == 0: continue r, _ = curve.exp(k) @@ -246,8 +275,8 @@ def sign(curve, prv, digest, mode=2001): return long2bytes(s, size) + long2bytes(r, size) -def verify(curve, pub, digest, signature, mode=2001): - """ Verify provided digest with the signature +def verify(curve, pub, digest, signature): + """Verify provided digest with the signature :param GOST3410Curve curve: curve to use :type pub: (long, long) @@ -257,7 +286,7 @@ def verify(curve, pub, digest, signature, mode=2001): :type signature: bytes, 64 or 128 bytes :rtype: bool """ - size = MODE2SIZE[mode] + size = curve.point_size if len(signature) != size * 2: raise ValueError("Invalid signature length") q = curve.q @@ -291,7 +320,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 @@ -299,23 +328,25 @@ def prv_unmarshal(prv): return bytes2long(prv[::-1]) -def pub_marshal(pub, mode=2001): +def pub_marshal(pub): """Marshal public key :type pub: (long, long) :rtype: bytes + :returns: LE(X) || LE(Y) """ - size = MODE2SIZE[mode] + size = point_size(pub[0]) return (long2bytes(pub[1], size) + long2bytes(pub[0], size))[::-1] -def pub_unmarshal(pub, mode=2001): +def pub_unmarshal(pub): """Unmarshal public key + :param pub: LE(X) || LE(Y) :type pub: bytes :rtype: (long, long) """ - size = MODE2SIZE[mode] + size = len(pub) // 2 pub = pub[::-1] return (bytes2long(pub[size:]), bytes2long(pub[:size]))