pygost/gost3410.py | 6 ++++-- pygost/gost3410_vko.py | 4 ++-- diff --git a/pygost/gost3410.py b/pygost/gost3410.py index 4292cb4e98ad1f60487060ea3c2481be52871f7af38a4a460b6152b08c57ef9d..3b595d1254c5c273c7eccd53b21ecd7f0459f358611e6118ef26a4d2a3a5b1e3 100644 --- a/pygost/gost3410.py +++ b/pygost/gost3410.py @@ -231,7 +231,7 @@ :param digest: digest for signing :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] @@ -305,7 +305,7 @@ return lm == r def prv_unmarshal(prv): - """Unmarshal private key + """Unmarshal little-endian private key :param bytes prv: serialized private key :rtype: long @@ -318,6 +318,7 @@ """Marshal public key :type pub: (long, long) :rtype: bytes + :returns: LE(X) || LE(Y) """ size = MODE2SIZE[mode] return (long2bytes(pub[1], size) + long2bytes(pub[0], size))[::-1] @@ -326,6 +327,7 @@ def pub_unmarshal(pub, mode=2001): """Unmarshal public key + :param pub: LE(X) || LE(Y) :type pub: bytes :rtype: (long, long) """ diff --git a/pygost/gost3410_vko.py b/pygost/gost3410_vko.py index 51ff8adea8f2127bd454e08ec6ac12de5c1d01e992cb340ba1c8627254f9fa3a..5d562358f8f2d1b52c59a7d9c1fd0c7652e7cfe6ca3fa25d9c8ef84ed0267e80 100644 --- a/pygost/gost3410_vko.py +++ b/pygost/gost3410_vko.py @@ -26,7 +26,7 @@ def ukm_unmarshal(ukm): """Unmarshal UKM value - :type ukm: bytes + :type ukm: little-endian bytes :rtype: long """ return bytes2long(ukm[::-1]) @@ -55,7 +55,7 @@ hash output. """ return GOST341194( kek(curve, prv, pub, ukm, mode=2001), - "id-GostR3411-94-CryptoProParamSet", + sbox="id-GostR3411-94-CryptoProParamSet", ).digest()