[DOC] Minor corrections

diff --git a/doc/developer.texi b/doc/developer.texi
index b32f1cb0150ec30a76f0d670e9a7f0aee8fb8cd6..f2fe00ec5ba392b87a26ee14c99ddffab48f1606 100644 (file)
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -4,12 +4,12 @@
 Pay attention how to get @ref{Sources, development source code}.
 
 @table @asis
-@item Nonce and identity obfuscation
-    @url{https://blake2.net/, BLAKE2b-MAC}.
 @item Data encryption
     @url{http://cr.yp.to/snuffle.html, Salsa20}.
 @item Message authentication
     @url{http://cr.yp.to/mac.html, Poly1305}.
+@item Nonce and identity obfuscation
+    @url{https://blake2.net/, BLAKE2b-MAC}.
 @item Password authenticated key agreement
     DH-A-EKE powered by @url{http://cr.yp.to/ecdh.html, Curve25519}
     and @url{http://ed25519.cr.yp.to/, Ed25519}.

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index a654dbff73854a5e56691b1043a7dcab2d2ceb05..6ea418170abf2d2f22d739fbdfae762544ea6b72 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -7,9 +7,9 @@
 @item Опциональная возможность использовать syslog для журналирования,
 с @url{https://tools.ietf.org/html/rfc5424, RFC 5424}-похожими
 структурированными записями.
-@item XTEA алгоритм больше не используется для обфускации nonce. Вместо
-него BLAKE2b-MAC. Теперь нешифрованный режим действительно не зависит
-оÑ\82 алгоÑ\80иÑ\82мов Ñ\88иÑ\84Ñ\80ованиÑ\8f.
+@item Вместо XTEA алгоритма для обфускации nonce используется
+BLAKE2b-MAC. Теперь нешифрованный режим действительно не зависит от
+алгоритмов шифрования.
 @end itemize
 
 @node Релиз 5.7

diff --git a/doc/news.texi b/doc/news.texi
index 70e5051cf21a1b84b2a6c447467078b1186c4dad..f363b846307e944ba69d94cdda795c0156adde26 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -9,9 +9,9 @@ See also this page @ref{Новости, on russian}.
 @item Optional ability to use syslog for logging, with
 @url{https://tools.ietf.org/html/rfc5424, RFC 5424}-like
 structured records.
-@item XTEA algorithm is not used anymore for nonce obfuscation.
-BLAKE2-MAC is used instead. Encryptionless mode now really does not
-depend on encryption functions.
+@item XTEA algorithm is not used anymore for nonce obfuscation, but
+BLAKE2b-MAC instead. Encryptionless mode now really does not depend on
+encryption functions.
 @end itemize
 
 @node Release 5.7

diff --git a/doc/transport.texi b/doc/transport.texi
index cb9b5d5737552016f11ef6765c808a46ab042b6f..1518d6f95fa59d02324409e9818234416827e5c0 100644 (file)
--- a/doc/transport.texi
+++ b/doc/transport.texi
@@ -2,7 +2,7 @@
 @section Transport protocol
 
 @verbatim
-     NONCE = MAC(MAC_KEY, SERIAL)
+     NONCE = 64bit(MAC(MAC_KEY, SERIAL))
    PAYLOAD = DATA || PAD [|| ZEROS]
 CIPHERTEXT = ENCRYPT(KEY, NONCE, PAYLOAD)
        TAG = AUTH(AUTH_KEY, CIPHERTEXT || NONCE)
@@ -41,9 +41,9 @@ drop when receiving duplicate ones.
 In @ref{Encless, encryptionless mode} this scheme is slightly different:
 
 @verbatim
- PACKET = ENCODED || NONCE
-ENCODED = ENCLESS(DATA || PAD || ZEROS)
   NONCE = MAC(MAC_KEY, SERIAL)
+ENCODED = ENCLESS(DATA || PAD || ZEROS)
+ PACKET = ENCODED || NONCE
 @end verbatim
 
 @code{ENCLESS} is AONT and chaffing function. There is no need in