Hexadecimal is more convenient

[pygost.git] / www.texi

diff --git a/www.texi b/www.texi
index 468d5465011a896dc00abfd3a0ba1c59b0ac7db5..a7b565f295a740163e97eadb725e6dde51317905 100644 (file)
--- a/www.texi
+++ b/www.texi
@@ -3,7 +3,7 @@
 @settitle PyGOST
 
 @copying
-Copyright @copyright{} 2015-2019 @email{stargrave@@stargrave.org, Sergey Matveev}
+Copyright @copyright{} 2015-2020 @email{stargrave@@stargrave.org, Sergey Matveev}
 @end copying
 
 @node Top
@@ -15,7 +15,7 @@ It is
 @url{https://www.gnu.org/philosophy/pragmatic.html, copylefted}
 @url{https://www.gnu.org/philosophy/free-sw.html, free software}:
 licenced under @url{https://www.gnu.org/licenses/gpl-3.0.html, GPLv3}.
-You can read about GOST algorithms @url{http://gost.cypherpunks.ru/, more}.
+You can read about GOST algorithms @url{http://www.gost.cypherpunks.ru/, more}.
 
 Currently supported algorithms are:
 
@@ -55,12 +55,17 @@ Currently supported algorithms are:
 @item GOST R 34.12-2015 64-bit block cipher Магма (Magma)
 @item GOST R 34.13-2015 padding methods and block cipher modes of operation
       (ECB, CTR, OFB, CBC, CFB, MAC)
+@item MGM AEAD mode for 64 and 128 bit ciphers (Р 1323565.1.026–2019)
+@item CTR-ACPKM, OMAC-ACPKM-Master modes of operation (Р 1323565.1.017-2018)
+@item KExp15/KImp15 key export/import functions (Р 1323565.1.017-2018)
+@item KDF_GOSTR3411_2012_256, KDF_TREE_GOSTR3411_2012_256 (Р 50.1.113-2016)
+@item KEG export key generation function (Р 1323565.1.020-2018)
 @item PEP247-compatible hash/MAC functions
 @end itemize
 
 Example 34.10-2012 keypair generation, signing and verifying:
 
-@verbatim
+@example
 >>> from pygost.gost3410 import CURVES
 >>> curve = CURVES["id-tc26-gost-3410-12-512-paramSetA"]
 >>> from os import urandom
@@ -74,13 +79,13 @@ Example 34.10-2012 keypair generation, signing and verifying:
 >>> print "Public key is:", hexenc(pub_marshal(pub))
 >>> from pygost import gost34112012256
 >>> data_for_signing = b"some data"
->>> dgst = gost34112012256.new(data_for_signing).digest()
+>>> dgst = gost34112012256.new(data_for_signing).digest()[::-1]
 >>> from pygost.gost3410 import sign
 >>> signature = sign(curve, prv, dgst, mode=2012)
 >>> from pygost.gost3410 import verify
 >>> verify(curve, pub, dgst, signature, mode=2012)
 True
-@end verbatim
+@end example
 
 Please send questions, bug reports and patches to
 @url{https://lists.cypherpunks.ru/mailman/listinfo/gost, gost}
@@ -88,7 +93,8 @@ mailing list. Announcements also go to this mailing list.
 
 @insertcopying
 
+@include faq.texi
 @include news.texi
-@include download.texi
+@include install.texi
 
 @bye