From bea62b33bb6f217dcb05b7b6be0e6327abf60fc3 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 10 Jan 2016 16:48:30 +0300 Subject: [PATCH] [DOC] Various small corrections Signed-off-by: Sergey Matveev --- doc/handshake.texi | 6 +++--- doc/transport.texi | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/handshake.texi b/doc/handshake.texi index c509c09..c469021 100644 --- a/doc/handshake.texi +++ b/doc/handshake.texi @@ -8,15 +8,15 @@ encrypted first 64 bits of each message with client's @ref{Identity} as a key. It is used to transmit identity and to mark packet as handshake message. -If @ref{Noise} is enabled, then junk data is inserted before -@code{IDtag} to fill up packet to MTU's size. +If @ref{Noise, noise} is enabled, then data is padded to fill up packet +to MTU's size. @strong{Preparation stage}: @enumerate @item Client knows only his identity and passphrase written somewhere in the -human. Server knows his identity and +human readable form. Server knows his identity and @ref{Verifier structure, verifier}: @code{DSAPub}. @item Client computes verifier which produces @code{DSAPriv} and diff --git a/doc/transport.texi b/doc/transport.texi index f5ca87e..4b8413b 100644 --- a/doc/transport.texi +++ b/doc/transport.texi @@ -25,15 +25,16 @@ TAG || ENCRYPTED || NONCE --> PACKET @end verbatim @code{SERIAL} is message's serial number. Odds are reserved for -client(->server) messages, evens for server(->client) messages. +client (to server) messages, evens for server (to client) messages. @code{PRP} is XTEA block cipher algorithm used here as PRP (pseudo random permutation function) to obfuscate @code{SERIAL}. Plaintext @code{SERIAL} state is kept in peers internal state, but encrypted before transmission. -XTEA's encryption key is the first 128-bit of Salsa20's output with -established common key and zero nonce (message nonces start from 1). +XTEA's encryption key @code{PRP_KEY} is the first 128-bit of Salsa20's +output with established common key and zero nonce (message nonces start +from 1). @verbatim PRP_KEY = 128bit(ENCRYPT(KEY, 0)) @@ -45,8 +46,7 @@ Salsa20's output is ignored and only remaining is XORed with ther data, encrypting it. @code{DATA} is padded with @code{PAD} (0x80 byte). Optional @code{ZEROS} -may follow, to fillup packet with the junk to conceal pyload packet -length. +may follow, to fill up packet to conceal payload packet length. @code{AUTH} is Poly1305 authentication function. First 256 bits of Salsa20's output are used as a one-time key for @code{AUTH}. -- 2.44.0