update docs to reflect changes in AES key handling

docs/protocol.rst

@@ -20,7 +20,9 @@ Basic Properties
   * ``destNick``: The nickname of the receiver
   * ``payload``: The content of the message. If an encrypted message, it is base64 encoded
   * ``hmac``: The HMAC as calculated by the sender to be verified against by the receiver
+  * ``key``: If the payload is encrypted, the AES key used for this message (base64 encoded and encrypted with RSA)
   * ``iv``: If the payload is encrypted, the AES IV used for this message (base64 encoded and encrypted with RSA)
+  * ``salt``: If the payload is encrypted, the AES salt used for this message (base64 encoded and encrypted with RSA)
   * ``error``: The error code, if applicable
 
 * All commands *are* case sensitive
@@ -66,8 +68,8 @@ Encryption Details
 * Each client generates a unique RSA keypair and AES key for each connection. The exception being if the user
   saved an RSA keypair. Then each connection uses the same keypair, but an AES key is randomly generated for
   each connection.
-* The AES IV is randomly generated for each message and sent along with the message encrypted with the RSA keys
-  that are exchanged in the handshake.
+* The AES key, IV, and salt are randomly generated for each message and sent along with the message encrypted
+  with the RSA keys that are exchanged in the handshake.
 
 -----------------
 Handshake Details
@@ -86,15 +88,11 @@ The commands in the handshake must be performed in the following order:
 +--------+---------+--------+
 |PUB_KEY |   ->    |        |
 +--------+---------+--------+
-|(switch to RSA encryption) |
-+--------+---------+--------+
-|AES_KEY |   ->    |        |
-+--------+---------+--------+
-|AES_SALT|   ->    |        |
-+--------+---------+--------+
 |(switch to AES encryption) |
 +--------+---------+--------+
 
+The client may reject a connection with the ``REJ`` command instead of sending the ``REDY`` command.
+
 --------------------
 Message Loop Details
 --------------------