review comments

randombit · Oct 18, 2022 · f126b55 · f126b55
1 parent defa8ac
commit f126b55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/lib/tls/msg_client_hello.cpp b/src/lib/tls/msg_client_hello.cpp
@@ -24,8 +24,8 @@
 #include <botan/internal/tls_handshake_hash.h>
 
 #ifdef BOTAN_HAS_TLS_13
-#include <botan/internal/tls_transcript_hash_13.h>
-#include <botan/internal/tls_handshake_layer_13.h>
+  #include <botan/internal/tls_transcript_hash_13.h>
+  #include <botan/internal/tls_handshake_layer_13.h>
 #endif
 
 #include <chrono>

diff --git a/src/lib/tls/tls13/tls_cipher_state.cpp b/src/lib/tls/tls13/tls_cipher_state.cpp
@@ -32,6 +32,7 @@
  *                                     *
  *                             STATE EARLY TRAFFIC
  * This state is reached by constructing Cipher_State using init_with_psk().
+ * In this state the early data traffic secrets are available. TODO: implement early data.
  * The state can then be further advanced using advance_with_server_hello().
  *                                     *
  *                                     |
@@ -50,9 +51,9 @@
  *                                     |
  *                                     *
  *                          STATE HANDSHAKE TRAFFIC
- * This state is reached by constructing Cipher_State using init_with_server_hello().
- * In this state the handshake traffic secrets are available. The state can then be further
- * advanced using advance_with_server_finished().
+ * This state is reached by constructing Cipher_State using init_with_server_hello() or
+ * advance_with_server_hello(). In this state the handshake traffic secrets are available.
+ * The state can then be further advanced using advance_with_server_finished().
  *                                     *
  *                                     |
  *                                     v
@@ -79,6 +80,8 @@
  *                                                           ClientHello...client Finished)
  *                                                           = resumption_master_secret
  *                             STATE COMPLETED
+ * Once this state is reached the handshake is finished and no further cipher state advances
+ * are possible.
  */
 
 #include <limits>

diff --git a/src/lib/tls/tls13/tls_client_impl_13.h b/src/lib/tls/tls13/tls_client_impl_13.h
@@ -83,8 +83,6 @@ class Client_Impl_13 : public Channel_Impl_13
       void handle(const Key_Update& key_update);
 
       void send_client_authentication(Channel_Impl_13::AggregatedMessages& flight);
-
-   private:
       std::optional<Session> find_session_for_resumption();
 
    private: