summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2021-04-14 12:04:37 +0200
committerFrancis Dupont <fdupont@isc.org>2021-05-11 18:02:34 +0200
commit8ec151b9990f571c0790eb70f4a96262c9d9848f (patch)
tree4f9c2d42035764eca12cf393a23e2339a85b5cb2
parent[(no branch, rebasing 1798-remove-tls-stream-clear-operation)] [#1798] Checkp... (diff)
downloadkea-8ec151b9990f571c0790eb70f4a96262c9d9848f.tar.xz
kea-8ec151b9990f571c0790eb70f4a96262c9d9848f.zip
[(no branch, rebasing 1798-remove-tls-stream-clear-operation)] [#1798] Checkpoint: removed clear
-rw-r--r--src/lib/asiolink/botan_tls.h5
-rw-r--r--src/lib/asiolink/common_tls.h7
-rw-r--r--src/lib/asiolink/openssl_tls.h5
-rw-r--r--src/lib/asiolink/tls_socket.h1
4 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/asiolink/botan_tls.h b/src/lib/asiolink/botan_tls.h
index 7f564ca19c..1735cc757c 100644
--- a/src/lib/asiolink/botan_tls.h
+++ b/src/lib/asiolink/botan_tls.h
@@ -131,11 +131,6 @@ public:
isc_throw(NotImplemented, "Botan TLS is not yet supported");
}
- /// @brief Clear the TLS state.
- virtual void clear() {
- isc_throw(NotImplemented, "Botan TLS is not yet supported");
- }
-
/// @brief Return the commonName part of the subjectName of
/// the peer certificate.
///
diff --git a/src/lib/asiolink/common_tls.h b/src/lib/asiolink/common_tls.h
index fd44182856..b119760ebf 100644
--- a/src/lib/asiolink/common_tls.h
+++ b/src/lib/asiolink/common_tls.h
@@ -34,8 +34,6 @@ enum TlsRole { CLIENT, SERVER };
class TlsContext;
/// @brief The type of shared pointers to TlsContext objects.
-///
-/// @note Not clear we need shared pointers but they cover more use cases...
typedef boost::shared_ptr<TlsContext> TlsContextPtr;
/// @brief TLS context base class.
@@ -153,11 +151,6 @@ public:
/// @param callback Callback object.
virtual void shutdown(Callback& callback) = 0;
- /// @brief Clear the TLS state.
- ///
- /// @note For some unit tests only.
- virtual void clear() = 0;
-
/// @brief Return the commonName part of the subjectName of
/// the peer certificate.
///
diff --git a/src/lib/asiolink/openssl_tls.h b/src/lib/asiolink/openssl_tls.h
index 9c224afcfa..e94b308862 100644
--- a/src/lib/asiolink/openssl_tls.h
+++ b/src/lib/asiolink/openssl_tls.h
@@ -149,11 +149,6 @@ public:
Base::async_shutdown(callback);
}
- /// @brief Clear the SSL object.
- virtual void clear() {
- static_cast<void>(::SSL_clear(this->native_handle()));
- }
-
/// @brief Return the commonName part of the subjectName of
/// the peer certificate.
///
diff --git a/src/lib/asiolink/tls_socket.h b/src/lib/asiolink/tls_socket.h
index b5ce4b6e36..cdd2f78d0c 100644
--- a/src/lib/asiolink/tls_socket.h
+++ b/src/lib/asiolink/tls_socket.h
@@ -508,7 +508,6 @@ TLSSocket<C>::shutdown(C& callback) {
template <typename C> void
TLSSocket<C>::close() {
- stream_.clear();
if (socket_.is_open() && stream_ptr_) {
socket_.close();
}