diff options
author | Jack Lloyd <[email protected]> | 2017-09-22 11:38:42 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-09-22 11:38:42 -0400 |
commit | 27482d71e00dcf106735ef824ded70cf25c6150f (patch) | |
tree | 60ee512ff6eed74051718920eb126c30c854e322 /src/lib/tls | |
parent | a2e70c4eb74d016d8b3c783b4964cfc5ea2b7ddf (diff) |
Apply final annotations to the library also
Done by a perl script which converted all classes to final, followed
by selective reversion where it caused compilation failures.
Diffstat (limited to 'src/lib/tls')
-rw-r--r-- | src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_alert.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_blocking.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_ciphersuite.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_client.cpp | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_exceptn.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_extensions.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_handshake_hash.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_policy.cpp | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_policy.h | 8 | ||||
-rw-r--r-- | src/lib/tls/tls_reader.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_record.h | 8 | ||||
-rw-r--r-- | src/lib/tls/tls_server.cpp | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_server_info.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_session.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_session_key.h | 2 | ||||
-rw-r--r-- | src/lib/tls/tls_session_manager.h | 4 | ||||
-rw-r--r-- | src/lib/tls/tls_version.h | 2 |
18 files changed, 25 insertions, 25 deletions
diff --git a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h index bd092c5b0..f906ae585 100644 --- a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h +++ b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h @@ -25,7 +25,7 @@ namespace TLS { * serious privacy risk in some situations. */ class BOTAN_PUBLIC_API(2,0) -Session_Manager_SQLite : public Session_Manager_SQL +Session_Manager_SQLite final : public Session_Manager_SQL { public: /** diff --git a/src/lib/tls/tls_alert.h b/src/lib/tls/tls_alert.h index f76fc4af1..89530e238 100644 --- a/src/lib/tls/tls_alert.h +++ b/src/lib/tls/tls_alert.h @@ -18,7 +18,7 @@ namespace TLS { /** * SSL/TLS Alert Message */ -class BOTAN_PUBLIC_API(2,0) Alert +class BOTAN_PUBLIC_API(2,0) Alert final { public: /** diff --git a/src/lib/tls/tls_blocking.h b/src/lib/tls/tls_blocking.h index 01620c652..c40d127ca 100644 --- a/src/lib/tls/tls_blocking.h +++ b/src/lib/tls/tls_blocking.h @@ -19,7 +19,7 @@ namespace TLS { * Blocking TLS Client * Can be used directly, or subclass to get handshake and alert notifications */ -class BOTAN_PUBLIC_API(2,0) Blocking_Client +class BOTAN_PUBLIC_API(2,0) Blocking_Client final { public: /* diff --git a/src/lib/tls/tls_ciphersuite.h b/src/lib/tls/tls_ciphersuite.h index 4543d81d2..6c2836f9d 100644 --- a/src/lib/tls/tls_ciphersuite.h +++ b/src/lib/tls/tls_ciphersuite.h @@ -19,7 +19,7 @@ namespace TLS { /** * Ciphersuite Information */ -class BOTAN_PUBLIC_API(2,0) Ciphersuite +class BOTAN_PUBLIC_API(2,0) Ciphersuite final { public: /** diff --git a/src/lib/tls/tls_client.cpp b/src/lib/tls/tls_client.cpp index 53d673a5c..ce19f04c9 100644 --- a/src/lib/tls/tls_client.cpp +++ b/src/lib/tls/tls_client.cpp @@ -19,7 +19,7 @@ namespace TLS { namespace { -class Client_Handshake_State : public Handshake_State +class Client_Handshake_State final : public Handshake_State { public: // using Handshake_State::Handshake_State; diff --git a/src/lib/tls/tls_exceptn.h b/src/lib/tls/tls_exceptn.h index 79b1042d3..1b58e1beb 100644 --- a/src/lib/tls/tls_exceptn.h +++ b/src/lib/tls/tls_exceptn.h @@ -34,7 +34,7 @@ class BOTAN_PUBLIC_API(2,0) TLS_Exception : public Exception /** * Unexpected_Message Exception */ -struct BOTAN_PUBLIC_API(2,0) Unexpected_Message : public TLS_Exception +struct BOTAN_PUBLIC_API(2,0) Unexpected_Message final : public TLS_Exception { explicit Unexpected_Message(const std::string& err) : TLS_Exception(Alert::UNEXPECTED_MESSAGE, err) {} diff --git a/src/lib/tls/tls_extensions.h b/src/lib/tls/tls_extensions.h index 9a92a1135..ee3310563 100644 --- a/src/lib/tls/tls_extensions.h +++ b/src/lib/tls/tls_extensions.h @@ -426,7 +426,7 @@ class Certificate_Status_Request final : public Extension /** * Represents a block of extensions in a hello message */ -class BOTAN_UNSTABLE_API Extensions +class BOTAN_UNSTABLE_API Extensions final { public: std::set<Handshake_Extension_Type> extension_types() const; diff --git a/src/lib/tls/tls_handshake_hash.h b/src/lib/tls/tls_handshake_hash.h index 1f80e2c3a..bb38015c8 100644 --- a/src/lib/tls/tls_handshake_hash.h +++ b/src/lib/tls/tls_handshake_hash.h @@ -18,7 +18,7 @@ namespace TLS { /** * TLS Handshake Hash */ -class Handshake_Hash +class Handshake_Hash final { public: void update(const uint8_t in[], size_t length) diff --git a/src/lib/tls/tls_policy.cpp b/src/lib/tls/tls_policy.cpp index 05a5b8b83..43926e314 100644 --- a/src/lib/tls/tls_policy.cpp +++ b/src/lib/tls/tls_policy.cpp @@ -317,7 +317,7 @@ std::vector<uint16_t> Policy::srtp_profiles() const namespace { -class Ciphersuite_Preference_Ordering +class Ciphersuite_Preference_Ordering final { public: Ciphersuite_Preference_Ordering(const std::vector<std::string>& ciphers, diff --git a/src/lib/tls/tls_policy.h b/src/lib/tls/tls_policy.h index 7e55f4eca..463f1c6d6 100644 --- a/src/lib/tls/tls_policy.h +++ b/src/lib/tls/tls_policy.h @@ -309,7 +309,7 @@ class BOTAN_PUBLIC_API(2,0) Policy /** * NSA Suite B 128-bit security level (RFC 6460) */ -class BOTAN_PUBLIC_API(2,0) NSA_Suite_B_128 : public Policy +class BOTAN_PUBLIC_API(2,0) NSA_Suite_B_128 final : public Policy { public: std::vector<std::string> allowed_ciphers() const override @@ -342,7 +342,7 @@ class BOTAN_PUBLIC_API(2,0) NSA_Suite_B_128 : public Policy /** * BSI TR-02102-2 Policy */ -class BOTAN_PUBLIC_API(2,0) BSI_TR_02102_2 : public Policy +class BOTAN_PUBLIC_API(2,0) BSI_TR_02102_2 final : public Policy { public: std::vector<std::string> allowed_ciphers() const override @@ -397,7 +397,7 @@ class BOTAN_PUBLIC_API(2,0) BSI_TR_02102_2 : public Policy /** * Policy for DTLS. We require DTLS v1.2 and an AEAD mode. */ -class BOTAN_PUBLIC_API(2,0) Datagram_Policy : public Policy +class BOTAN_PUBLIC_API(2,0) Datagram_Policy final : public Policy { public: std::vector<std::string> allowed_macs() const override @@ -417,7 +417,7 @@ class BOTAN_PUBLIC_API(2,0) Datagram_Policy : public Policy * to use if you control both sides of the protocol and don't have to worry * about ancient and/or bizarre TLS implementations. */ -class BOTAN_PUBLIC_API(2,0) Strict_Policy : public Policy +class BOTAN_PUBLIC_API(2,0) Strict_Policy final : public Policy { public: std::vector<std::string> allowed_ciphers() const override; diff --git a/src/lib/tls/tls_reader.h b/src/lib/tls/tls_reader.h index e88335227..588335144 100644 --- a/src/lib/tls/tls_reader.h +++ b/src/lib/tls/tls_reader.h @@ -21,7 +21,7 @@ namespace TLS { /** * Helper class for decoding TLS protocol messages */ -class TLS_Data_Reader +class TLS_Data_Reader final { public: TLS_Data_Reader(const char* type, const std::vector<uint8_t>& buf_in) : diff --git a/src/lib/tls/tls_record.h b/src/lib/tls/tls_record.h index 63989a17e..1fe3a558b 100644 --- a/src/lib/tls/tls_record.h +++ b/src/lib/tls/tls_record.h @@ -28,7 +28,7 @@ class Connection_Sequence_Numbers; /** * TLS Cipher State */ -class Connection_Cipher_State +class Connection_Cipher_State final { public: /** @@ -71,7 +71,7 @@ class Connection_Cipher_State bool m_cbc_nonce; }; -class Record +class Record final { public: Record(secure_vector<uint8_t>& data, @@ -99,7 +99,7 @@ class Record size_t m_size; }; -class Record_Message +class Record_Message final { public: Record_Message(const uint8_t* data, size_t size) @@ -120,7 +120,7 @@ class Record_Message size_t m_size; }; -class Record_Raw_Input +class Record_Raw_Input final { public: Record_Raw_Input(const uint8_t* data, size_t size, size_t& consumed, diff --git a/src/lib/tls/tls_server.cpp b/src/lib/tls/tls_server.cpp index 1c9ca0b86..c0e853a80 100644 --- a/src/lib/tls/tls_server.cpp +++ b/src/lib/tls/tls_server.cpp @@ -16,7 +16,7 @@ namespace Botan { namespace TLS { -class Server_Handshake_State : public Handshake_State +class Server_Handshake_State final : public Handshake_State { public: Server_Handshake_State(Handshake_IO* io, Callbacks& cb) diff --git a/src/lib/tls/tls_server_info.h b/src/lib/tls/tls_server_info.h index d1d66bdb6..d05af6acc 100644 --- a/src/lib/tls/tls_server_info.h +++ b/src/lib/tls/tls_server_info.h @@ -18,7 +18,7 @@ namespace TLS { /** * Represents information known about a TLS server. */ -class BOTAN_PUBLIC_API(2,0) Server_Information +class BOTAN_PUBLIC_API(2,0) Server_Information final { public: /** diff --git a/src/lib/tls/tls_session.h b/src/lib/tls/tls_session.h index 5b31e8622..62e2b2df9 100644 --- a/src/lib/tls/tls_session.h +++ b/src/lib/tls/tls_session.h @@ -24,7 +24,7 @@ namespace TLS { /** * Class representing a TLS session state */ -class BOTAN_PUBLIC_API(2,0) Session +class BOTAN_PUBLIC_API(2,0) Session final { public: diff --git a/src/lib/tls/tls_session_key.h b/src/lib/tls/tls_session_key.h index ae0db88ca..2c1eac523 100644 --- a/src/lib/tls/tls_session_key.h +++ b/src/lib/tls/tls_session_key.h @@ -19,7 +19,7 @@ class Handshake_State; /** * TLS Session Keys */ -class Session_Keys +class Session_Keys final { public: /** diff --git a/src/lib/tls/tls_session_manager.h b/src/lib/tls/tls_session_manager.h index 215ad1303..e6b5a3194 100644 --- a/src/lib/tls/tls_session_manager.h +++ b/src/lib/tls/tls_session_manager.h @@ -83,7 +83,7 @@ class BOTAN_PUBLIC_API(2,0) Session_Manager * An implementation of Session_Manager that does not save sessions at * all, preventing session resumption. */ -class BOTAN_PUBLIC_API(2,0) Session_Manager_Noop : public Session_Manager +class BOTAN_PUBLIC_API(2,0) Session_Manager_Noop final : public Session_Manager { public: bool load_from_session_id(const std::vector<uint8_t>&, Session&) override @@ -105,7 +105,7 @@ class BOTAN_PUBLIC_API(2,0) Session_Manager_Noop : public Session_Manager /** * An implementation of Session_Manager that saves values in memory. */ -class BOTAN_PUBLIC_API(2,0) Session_Manager_In_Memory : public Session_Manager +class BOTAN_PUBLIC_API(2,0) Session_Manager_In_Memory final : public Session_Manager { public: /** diff --git a/src/lib/tls/tls_version.h b/src/lib/tls/tls_version.h index a311db909..dd1d09530 100644 --- a/src/lib/tls/tls_version.h +++ b/src/lib/tls/tls_version.h @@ -18,7 +18,7 @@ namespace TLS { /** * TLS Protocol Version */ -class BOTAN_PUBLIC_API(2,0) Protocol_Version +class BOTAN_PUBLIC_API(2,0) Protocol_Version final { public: enum Version_Code { |