Merge pull request #25503 from vespa-engine/havardpe/maybe-tls-is-abstract-tls

let MaybeTlsCryptoEngine be an AbstractTlsCryptoEngine

2 files changed, 14 insertions, 1 deletions

diff --git a/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.cpp b/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.cpp
index 832d52c0383..971256ff402 100644
--- a/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.cpp
+++ b/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.cpp
@@ -2,11 +2,22 @@
 
 #include "maybe_tls_crypto_engine.h"
 #include "maybe_tls_crypto_socket.h"
+#include "crypto_codec.h"
 
 namespace vespalib {
 
 MaybeTlsCryptoEngine::~MaybeTlsCryptoEngine() = default;
 
+std::unique_ptr<net::tls::CryptoCodec>
+MaybeTlsCryptoEngine::create_tls_client_crypto_codec(const SocketHandle &socket, const SocketSpec &spec) {
+    return _tls_engine->create_tls_client_crypto_codec(socket, spec);
+}
+
+std::unique_ptr<net::tls::CryptoCodec>
+MaybeTlsCryptoEngine::create_tls_server_crypto_codec(const SocketHandle &socket) {
+    return _tls_engine->create_tls_server_crypto_codec(socket);
+}
+
 CryptoSocket::UP
 MaybeTlsCryptoEngine::create_client_crypto_socket(SocketHandle socket, const SocketSpec &spec)
 {
diff --git a/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.h b/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.h
index 2b82d6eb8bc..e69d5858eab 100644
--- a/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.h
+++ b/vespalib/src/vespa/vespalib/net/tls/maybe_tls_crypto_engine.h
@@ -15,7 +15,7 @@ namespace vespalib {
  * connections is controlled by the use_tls_when_client flag given to
  * the constructor.
  **/
-class MaybeTlsCryptoEngine : public CryptoEngine
+class MaybeTlsCryptoEngine : public AbstractTlsCryptoEngine
 {
 private:
     std::shared_ptr<NullCryptoEngine> _null_engine;
@@ -29,6 +29,8 @@ public:
           _tls_engine(std::move(tls_engine)),
           _use_tls_when_client(use_tls_when_client) {}
     ~MaybeTlsCryptoEngine() override;
+    std::unique_ptr<CryptoCodec> create_tls_client_crypto_codec(const SocketHandle &socket, const SocketSpec &spec) override;
+    std::unique_ptr<CryptoCodec> create_tls_server_crypto_codec(const SocketHandle &socket) override;
     bool use_tls_when_client() const override { return _use_tls_when_client; }
     bool always_use_tls_when_server() const override { return false; }
     CryptoSocket::UP create_client_crypto_socket(SocketHandle socket, const SocketSpec &spec) override;