[tor-commits] [torspec] 14/14: Merge remote-tracking branches 'tor-gitlab/mr/114' and 'tor-gitlab/mr/115'

[gitolite role]

This is an automated email from the git hooks/post-receive script.

nickm pushed a commit to branch main
in repository torspec.

commit 4234d9325913a0c2ab54a86f2108b3fe99551035
Merge: b7aeade 71d7e71
Author: Nick Mathewson <nickm at torproject.org>
AuthorDate: Wed Feb 8 11:37:35 2023 -0500

    Merge remote-tracking branches 'tor-gitlab/mr/114' and 'tor-gitlab/mr/115'

 proposals/340-packed-and-fragmented.md | 61 ++++++++++++++++++++++++++++------
 rend-spec-v3.txt                       | 26 ++++++---------
 tor-spec.txt                           |  2 +-
 3 files changed, 62 insertions(+), 27 deletions(-)

diff --cc rend-spec-v3.txt
index c1d9a2a,672248e..0dc20db
--- a/rend-spec-v3.txt
+++ b/rend-spec-v3.txt
@@@ -1236,12 -1229,11 +1236,13 @@@ Table of contents
        data of the right size (that's 8 bytes for 'client-id', 16 bytes for 'iv'
        and 16 bytes for 'encrypted-cookie' all encoded with base64).
  
 -      When client authorization is enabled, each "auth-client" line contains
 -      the descriptor cookie encrypted to each individual client. We assume that
 -      each authorized client possesses a pre-shared x25519 keypair
 -      KS/KP_hsc_desc_enc which is used to decrypt the descriptor cookie.
 +      When client authorization is enabled, each "auth-client" line
 +      contains the descriptor cookie `N_hs_desc_enc` encrypted to each
 +      individual client. We assume that each authorized client possesses
 +      a pre-shared x25519 keypair (`KP_hsc_desc_enc`) which is used to
 +      decrypt the descriptor cookie.
 +
+ 
        We now describe the descriptor cookie encryption scheme. Here are the
        relevant keys:
  

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.