From 3792990da210024fb097e1dd96afdf5e13318066 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 26 Nov 2016 11:32:05 +0300 Subject: [PATCH] Use more correct "key agreement" term instead of Diffie-Hellman --- README | 4 ++-- pygost/gost3410_vko.py | 8 ++++---- www.texi | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README b/README index 01bed0a..ebb91c2 100644 --- a/README +++ b/README @@ -11,8 +11,8 @@ GOST is GOvernment STandard of Russian Federation (and Soviet Union). * GOST R 34.10-2001 (RFC 5832) public key signature function * 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 (RFC 7836) +* VKO GOST R 34.10-2001 key agreement function (RFC 4357) +* VKO GOST R 34.10-2012 key agreement 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 46812cd..14ad816 100644 --- a/pygost/gost3410_vko.py +++ b/pygost/gost3410_vko.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -"""Diffie-Hellman functions, VKO GOST R 34.10-2001/2012 +"""Key agreement functions, VKO GOST R 34.10-2001/2012 """ from pygost.gost3410 import pub_marshal @@ -40,7 +40,7 @@ def kek(curve, prv, pub, ukm, mode): def kek_34102001(curve, prv, pub, ukm): - """ Make Diffie-Hellman computation (34.10-2001, 34.11-94) + """ Key agreement (34.10-2001, 34.11-94) :param GOST3410Curve curve: curve to use :param long prv: private key @@ -61,7 +61,7 @@ def kek_34102001(curve, prv, pub, ukm): def kek_34102012256(curve, prv, pub, ukm=1): - """ Make Diffie-Hellman computation (34.10-2012, 34.11-2012 256 bit) + """ Key agreement (34.10-2012, 34.11-2012 256 bit) :param GOST3410Curve curve: curve to use :param long prv: private key @@ -78,7 +78,7 @@ def kek_34102012256(curve, prv, pub, ukm=1): def kek_34102012512(curve, prv, pub, ukm=1): - """ Make Diffie-Hellman computation (34.10-2012, 34.11-2012 512 bit) + """ Key agreement (34.10-2012, 34.11-2012 512 bit) :param GOST3410Curve curve: curve to use :param long prv: private key diff --git a/www.texi b/www.texi index d0550c6..2c4649f 100644 --- a/www.texi +++ b/www.texi @@ -37,9 +37,9 @@ Currently supported algorithms are: (@url{https://tools.ietf.org/html/rfc7091.html, RFC 7091}) public key signature function @item various 34.10 curve parameters included -@item VKO GOST R 34.10-2001 Diffie-Hellman function +@item VKO GOST R 34.10-2001 key agreement function (@url{https://tools.ietf.org/html/rfc4357.html, RFC 4357}) -@item VKO GOST R 34.10-2012 Diffie-Hellman function +@item VKO GOST R 34.10-2012 key agreement function (@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}) -- 2.44.0