aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/tls/tls_messages.h
diff options
context:
space:
mode:
authorTomasz Frydrych <[email protected]>2017-04-02 22:24:31 +0200
committerTomasz Frydrych <[email protected]>2017-04-03 23:42:29 +0200
commitfbef72e11c483fae16c32480cf84253a56d0ee25 (patch)
tree200b0fe290e9809ef6c8883e886b7c9a48c902a1 /src/lib/tls/tls_messages.h
parent753b4c2d5301574d3c9390b79aa275a49809e6c8 (diff)
Content:
* fixes for deprecated constructions in c++11 and later (explicit rule of 3/5 or implicit rule of 0 and other violations) * `default` specifier instead of `{}` in some places(probably all) * removal of unreachable code (for example `return` after `throw`) * removal of compilation unit only visible, but not used functions * fix for `throw()` specifier - used instead `BOTAN_NOEXCEPT` * removed not needed semicolons
Diffstat (limited to 'src/lib/tls/tls_messages.h')
-rw-r--r--src/lib/tls/tls_messages.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
index 5a1f03a06..aaf372447 100644
--- a/src/lib/tls/tls_messages.h
+++ b/src/lib/tls/tls_messages.h
@@ -20,17 +20,17 @@
#include <string>
#include <set>
-namespace Botan {
-
-class Credentials_Manager;
+#if defined(BOTAN_HAS_CECPQ1)
+ #include <botan/cecpq1.h>
+#endif
#if defined(BOTAN_HAS_SRP6)
-class SRP6_Server_Session;
+ #include <botan/srp6.h>
#endif
-#if defined(BOTAN_HAS_CECPQ1)
-class CECPQ1_key;
-#endif
+namespace Botan {
+
+class Credentials_Manager;
namespace TLS {
@@ -75,10 +75,10 @@ class BOTAN_DLL Client_Hello final : public Handshake_Message
const std::string& srp_identifier = "")
: m_new_session_version(version),
m_hostname(hostname),
- m_srp_identifier(srp_identifier) {};
+ m_srp_identifier(srp_identifier) {}
- const Protocol_Version protocol_version() const { return m_new_session_version; };
- const std::string& hostname() const { return m_hostname; };
+ const Protocol_Version protocol_version() const { return m_new_session_version; }
+ const std::string& hostname() const { return m_hostname; }
const std::string& srp_identifier() const { return m_srp_identifier; }
private:
@@ -267,11 +267,11 @@ class BOTAN_DLL Server_Hello final : public Handshake_Message
m_new_session_version(new_session_version),
m_ciphersuite(ciphersuite),
m_compression(compression),
- m_offer_session_ticket(offer_session_ticket) {};
+ m_offer_session_ticket(offer_session_ticket) {}
- const std::vector<uint8_t>& session_id() const { return m_new_session_id; };
- Protocol_Version protocol_version() const { return m_new_session_version; };
- uint16_t ciphersuite() const { return m_ciphersuite; };
+ const std::vector<uint8_t>& session_id() const { return m_new_session_id; }
+ Protocol_Version protocol_version() const { return m_new_session_version; }
+ uint16_t ciphersuite() const { return m_ciphersuite; }
uint8_t compression() const { return m_compression; }
bool offer_session_ticket() const { return m_offer_session_ticket; }
@@ -622,7 +622,7 @@ class BOTAN_DLL Server_Key_Exchange final : public Handshake_Message
const std::string& sig_alg,
Protocol_Version version);
- ~Server_Key_Exchange();
+ ~Server_Key_Exchange() = default;
private:
std::vector<uint8_t> serialize() const override;