tls crypto adapter

2 files changed, 8 insertions, 0 deletions

diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt
index f935590ee77..2bacd37686a 100644
--- a/fnet/src/tests/frt/rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/rpc/CMakeLists.txt
@@ -7,6 +7,7 @@ vespa_add_executable(fnet_invoke_test_app TEST
 )
 vespa_add_test(NAME fnet_invoke_test_app COMMAND fnet_invoke_test_app)
 vespa_add_test(NAME fnet_invoke_test_app_xor COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=xor")
+vespa_add_test(NAME fnet_invoke_test_app_tls COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=tls")
 vespa_add_executable(fnet_detach_return_invoke_test_app TEST
     SOURCES
     detach_return_invoke.cpp
@@ -22,6 +23,7 @@ vespa_add_executable(fnet_session_test_app TEST
 )
 vespa_add_test(NAME fnet_session_test_app COMMAND fnet_session_test_app)
 vespa_add_test(NAME fnet_session_test_app_xor COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=xor")
+vespa_add_test(NAME fnet_session_test_app_tls COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls")
 vespa_add_executable(fnet_sharedblob_test_app TEST
     SOURCES
     sharedblob.cpp
diff --git a/fnet/src/tests/frt/rpc/my_crypto_engine.hpp b/fnet/src/tests/frt/rpc/my_crypto_engine.hpp
index 6f573e5695a..f460a3c9283 100644
--- a/fnet/src/tests/frt/rpc/my_crypto_engine.hpp
+++ b/fnet/src/tests/frt/rpc/my_crypto_engine.hpp
@@ -1,5 +1,8 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/vespalib/net/tls/tls_crypto_engine.h>
+#include <vespa/vespalib/test/make_tls_options_for_testing.h>
+
 vespalib::CryptoEngine::SP my_crypto_engine() {
     const char *env_str = getenv("CRYPTOENGINE");
     if (!env_str) {
@@ -10,6 +13,9 @@ vespalib::CryptoEngine::SP my_crypto_engine() {
     if (engine == "xor") {
         fprintf(stderr, "crypto engine: xor\n");
         return std::make_shared<vespalib::XorCryptoEngine>();
+    } else if (engine == "tls") {
+        fprintf(stderr, "crypto engine: tls\n");
+        return std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing());
     }
     TEST_FATAL(("invalid crypto engine: " + engine).c_str());
     abort();