more module separation

Co-authored-by: René Meusel <rene.meusel@nexenio.com>
randombit · Feb 24, 2022 · 5f5c4d7 · 5f5c4d7
1 parent cd07457
commit 5f5c4d7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 109 deletions.
diff --git a/src/lib/tls/info.txt b/src/lib/tls/info.txt
@@ -41,11 +41,9 @@ eme_pkcs1
 emsa_pkcs1
 gcm
 hmac
-prf_tls
 rng
 rsa
 sha2_32
 sha2_64
-tls12
 x509
 </requires>
diff --git a/src/lib/tls/tls12/msg_session_ticket.cpp → src/lib/tls/msg_session_ticket.cpp b/src/lib/tls/tls12/msg_session_ticket.cpp → src/lib/tls/msg_session_ticket.cpp
diff --git a/src/lib/tls/tls12/info.txt b/src/lib/tls/tls12/info.txt
@@ -34,4 +34,5 @@ rsa
 sha2_32
 sha2_64
 x509
+tls
 </requires>
diff --git a/src/lib/tls/tls12/tls_handshake_state.cpp b/src/lib/tls/tls12/tls_handshake_state.cpp
@@ -148,54 +148,6 @@ void Handshake_State::server_certs(Certificate_12* server_certs)
  note_message(*m_server_certs);
  }
 
-
-#if defined(BOTAN_HAS_TLS_13)
-
-void Handshake_State::client_hello(Client_Hello_13* client_hello)
- {
- m_client_hello_13.reset(client_hello);
- }
-
-void Handshake_State::server_hello(Server_Hello_13* server_hello)
- {
- m_server_hello_13.reset(server_hello);
- m_ciphersuite = Ciphersuite::by_id(m_server_hello_13->ciphersuite());
- note_message(*m_server_hello_13);
- }
-
-void Handshake_State::server_certs(Certificate_13* server_certs)
- {
- m_server_certs_13.reset(server_certs);
- note_message(*m_server_certs_13);
- }
-
-void Handshake_State::client_verify(Certificate_Verify_13* client_verify)
- {
- m_client_verify_13.reset(client_verify);
- note_message(*m_client_verify_13);
- }
-
-void Handshake_State::server_verify(Certificate_Verify_13* server_verify)
- {
- m_server_verify_13.reset(server_verify);
- note_message(*m_server_verify_13);
- }
-
-void Handshake_State::server_finished(Finished_13* server_finished)
- {
- m_server_finished_13.reset(server_finished);
- note_message(*m_server_finished_13);
- }
-
-void Handshake_State::client_finished(Finished_13* client_finished)
- {
- m_client_finished_13.reset(client_finished);
- note_message(*m_client_finished_13);
- }
-
-
-#endif
-
 void Handshake_State::server_cert_status(Certificate_Status* server_cert_status)
  {
  m_server_cert_status.reset(server_cert_status);
@@ -234,14 +186,14 @@ void Handshake_State::client_kex(Client_Key_Exchange* client_kex)
 
 void Handshake_State::client_verify(Certificate_Verify_12* client_verify)
  {
- m_client_verify_12.reset(client_verify);
- note_message(*m_client_verify_12);
+ m_client_verify.reset(client_verify);
+ note_message(*m_client_verify);
  }
 
 void Handshake_State::server_verify(Certificate_Verify_12* server_verify)
  {
- m_server_verify_12.reset(server_verify);
- note_message(*m_server_verify_12);
+ m_server_verify.reset(server_verify);
+ note_message(*m_server_verify);
  }
 
 void Handshake_State::new_session_ticket(New_Session_Ticket_12* new_session_ticket)

diff --git a/src/lib/tls/tls12/tls_handshake_state.h b/src/lib/tls/tls12/tls_handshake_state.h
@@ -33,22 +33,17 @@ class Policy;
 
 class Hello_Verify_Request;
 class Client_Hello_12;
-class Client_Hello_13;
 class Server_Hello_12;
-class Server_Hello_13;
 class Encrypted_Extensions;
 class Certificate_12;
-class Certificate_13;
 class Certificate_Status;
 class Server_Key_Exchange;
 class Certificate_Req;
 class Server_Hello_Done;
 class Client_Key_Exchange;
 class Certificate_Verify_12;
-class Certificate_Verify_13;
 class New_Session_Ticket_12;
 class Finished_12;
-class Finished_13;
 
 /**
 * SSL/TLS Handshake State
@@ -140,19 +135,6 @@ class Handshake_State
 
  void new_session_ticket(New_Session_Ticket_12* new_session_ticket);
 
-#if defined(BOTAN_HAS_TLS_13)
- void client_hello(Client_Hello_13* client_hello);
- void server_hello(Server_Hello_13* server_hello);
-
- void server_certs(Certificate_13* server_certs);
-
- void client_verify(Certificate_Verify_13* client_verify);
- void server_verify(Certificate_Verify_13* server_verify);
-
- void server_finished(Finished_13* server_finished);
- void client_finished(Finished_13* client_finished);
-#endif
-
  const Client_Hello_12* client_hello() const
  { return m_client_hello.get(); }
 
@@ -162,29 +144,6 @@ class Handshake_State
  const Certificate_12* server_certs() const
  { return m_server_certs.get(); }
 
-#if defined(BOTAN_HAS_TLS_13)
- const Client_Hello_13* client_hello_13() const
- { return m_client_hello_13.get(); }
-
- const Server_Hello_13* server_hello_13() const
- { return m_server_hello_13.get(); }
-
- const Certificate_13* server_certs_13() const
- { return m_server_certs_13.get(); }
-
- const Certificate_Verify_13* client_verify_13() const
- { return m_client_verify_13.get(); }
-
- const Certificate_Verify_13* server_verify_13() const
- { return m_server_verify_13.get(); }
-
- const Finished_13* server_finished_13() const
- { return m_server_finished_13.get(); }
-
- const Finished_13* client_finished_13() const
- { return m_client_finished_13.get(); }
-#endif
-
  const Encrypted_Extensions* encrypted_extensions() const
  { return m_encrypted_extensions.get(); }
 
@@ -204,10 +163,10 @@ class Handshake_State
  { return m_client_kex.get(); }
 
  const Certificate_Verify_12* client_verify() const
- { return m_client_verify_12.get(); }
+ { return m_client_verify.get(); }
 
  const Certificate_Verify_12* server_verify() const
- { return m_server_verify_12.get(); }
+ { return m_server_verify.get(); }
 
  const Certificate_Status* server_cert_status() const
  { return m_server_cert_status.get(); }
@@ -259,21 +218,11 @@ class Handshake_State
  std::unique_ptr<Server_Hello_Done> m_server_hello_done;
  std::unique_ptr<Certificate_12> m_client_certs;
  std::unique_ptr<Client_Key_Exchange> m_client_kex;
- std::unique_ptr<Certificate_Verify_12> m_client_verify_12;
- std::unique_ptr<Certificate_Verify_12> m_server_verify_12;
+ std::unique_ptr<Certificate_Verify_12> m_client_verify;
+ std::unique_ptr<Certificate_Verify_12> m_server_verify;
  std::unique_ptr<New_Session_Ticket_12> m_new_session_ticket;
  std::unique_ptr<Finished_12> m_server_finished;
  std::unique_ptr<Finished_12> m_client_finished;
-
-#if defined(BOTAN_HAS_TLS_13)
- std::unique_ptr<Client_Hello_13> m_client_hello_13;
- std::unique_ptr<Server_Hello_13> m_server_hello_13;
- std::unique_ptr<Certificate_13> m_server_certs_13;
- std::unique_ptr<Certificate_Verify_13> m_client_verify_13;
- std::unique_ptr<Certificate_Verify_13> m_server_verify_13;
- std::unique_ptr<Finished_13> m_server_finished_13;
- std::unique_ptr<Finished_13> m_client_finished_13;
-#endif
  };
 
 }

diff --git a/src/lib/tls/tls13/info.txt b/src/lib/tls/tls13/info.txt
@@ -17,4 +17,5 @@ tls_transcript_hash_13.h
 
 <requires>
 hkdf
+tls
 </requires>