From c20420a078765a2afc54568357c49cdeb9f20cd4 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Fri, 25 Nov 2016 00:37:06 +0300 Subject: [PATCH] VKO 34.10-2012 has corresponding RFC 7836 --- README | 2 +- pygost/gost3410_vko.py | 6 ++++++ www.texi | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README b/README index 3e98f11..01bed0a 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ GOST is GOvernment STandard of Russian Federation (and Soviet Union). * GOST R 34.10-2012 (RFC 7091) public key signature function * various 34.10 curve parameters included * VKO GOST R 34.10-2001 Diffie-Hellman function (RFC 4357) -* VKO GOST R 34.10-2012 Diffie-Hellman function +* VKO GOST R 34.10-2012 Diffie-Hellman function (RFC 7836) * 28147-89 and CryptoPro key wrapping (RFC 4357) * 28147-89 CryptoPro key meshing for CFB mode (RFC 4357) * RFC 4491 (using GOST algorithms with X.509) compatibility helpers diff --git a/pygost/gost3410_vko.py b/pygost/gost3410_vko.py index caf3b5b..46812cd 100644 --- a/pygost/gost3410_vko.py +++ b/pygost/gost3410_vko.py @@ -70,6 +70,9 @@ def kek_34102012256(curve, prv, pub, ukm=1): :param long ukm: user keying material, VKO-factor :returns: Key Encryption Key (shared key) :rtype: bytes, 32 bytes + + Shared Key Encryption Key computation is based on + :rfc:`7836` VKO GOST R 34.10-2012. """ return GOST34112012256(kek(curve, prv, pub, ukm, mode=2012)).digest() @@ -84,5 +87,8 @@ def kek_34102012512(curve, prv, pub, ukm=1): :param long ukm: user keying material, VKO-factor :returns: Key Encryption Key (shared key) :rtype: bytes, 32 bytes + + 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() diff --git a/www.texi b/www.texi index f785c2e..d0550c6 100644 --- a/www.texi +++ b/www.texi @@ -40,7 +40,7 @@ Currently supported algorithms are: @item VKO GOST R 34.10-2001 Diffie-Hellman function (@url{https://tools.ietf.org/html/rfc4357.html, RFC 4357}) @item VKO GOST R 34.10-2012 Diffie-Hellman function - (@url{http://tc26.ru/methods/recommendation/%D0%A2%D0%9A26%D0%90%D0%9B%D0%93.pdf, ТК26}) + (@url{https://tools.ietf.org/html/rfc7836.html, RFC 7836}) @item 28147-89 and CryptoPro key wrapping (@url{https://tools.ietf.org/html/rfc4357.html, RFC 4357}) @item 28147-89 CryptoPro key meshing for CFB mode -- 2.44.0