VKO 34.10-2012 has corresponding RFC 7836

diff --git a/README b/README
index 3e98f1109d89bc28c64578c44278b376ec8ed846..01bed0af617a92720f7b5f1d99d0159e07678610 100644 (file)
--- 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 caf3b5bd2585d8e1dae25511045a19fc1f4c72ca..46812cd75f0cf501d983cf50f3be91a6cdf69565 100644 (file)
--- 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 f785c2ee10c6a31ab6dc40338c680291b7575500..d0550c69d2a30aa5a84c808cfe10652d4551c8a0 100644 (file)
--- 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