X-Git-Url: http://www.git.cypherpunks.ru/?p=pygost.git;a=blobdiff_plain;f=pygost%2Fgost3410_vko.py;h=4bc2d4e9df85410c7d21d6f7ab88999e1a95b25d;hp=7bc71113b69e99bcf10dbe2d819d2d8b96361a47;hb=82af8726ef5d5e2752089a45750e56c9910398c7;hpb=744398c0b6a3ab223d91cbf56a72932a7c87381d diff --git a/pygost/gost3410_vko.py b/pygost/gost3410_vko.py index 7bc7111..4bc2d4e 100644 --- a/pygost/gost3410_vko.py +++ b/pygost/gost3410_vko.py @@ -32,10 +32,10 @@ def ukm_unmarshal(ukm): return bytes2long(ukm[::-1]) -def kek(curve, prv, pub, ukm, mode): +def kek(curve, prv, pub, ukm): key = curve.exp(prv, pub[0], pub[1]) key = curve.exp(curve.cofactor * ukm, key[0], key[1]) - return pub_marshal(key, mode) + return pub_marshal(key) def kek_34102001(curve, prv, pub, ukm): @@ -54,12 +54,12 @@ def kek_34102001(curve, prv, pub, ukm): hash output. """ return GOST341194( - kek(curve, prv, pub, ukm, mode=2001), + kek(curve, prv, pub, ukm), sbox="id-GostR3411-94-CryptoProParamSet", ).digest() -def kek_34102012256(curve, prv, pub, ukm=1, mode=2012): +def kek_34102012256(curve, prv, pub, ukm=1): """ Key agreement (34.10-2012, 34.11-2012 256 bit) :param GOST3410Curve curve: curve to use @@ -73,7 +73,7 @@ def kek_34102012256(curve, prv, pub, ukm=1, mode=2012): Shared Key Encryption Key computation is based on :rfc:`7836` VKO GOST R 34.10-2012. """ - return GOST34112012256(kek(curve, prv, pub, ukm, mode=mode)).digest() + return GOST34112012256(kek(curve, prv, pub, ukm)).digest() def kek_34102012512(curve, prv, pub, ukm=1): @@ -90,4 +90,4 @@ def kek_34102012512(curve, prv, pub, ukm=1): Shared Key Encryption Key computation is based on :rfc:`7836` VKO GOST R 34.10-2012. """ - return GOST34112012512(kek(curve, prv, pub, ukm, mode=2012)).digest() + return GOST34112012512(kek(curve, prv, pub, ukm)).digest()