diff options
| author | Håvard Pettersen <havardpe@oath.com> | 2018-09-27 15:39:34 +0000 |
|---|---|---|
| committer | Håvard Pettersen <havardpe@oath.com> | 2018-09-27 16:11:07 +0000 |
| commit | 763f8e2f35a76bbc15df66843162400fbe136a56 (patch) | |
| tree | d9840b55b8bfcee4ed76a39d7b933e9d78e08064 /fnet | |
| parent | f905c1d6993b22ca5132e10bacd21761c35b5fc5 (diff) | |
mixed mode tls support in fnet
Diffstat (limited to 'fnet')
| -rw-r--r-- | fnet/src/tests/frt/rpc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | fnet/src/tests/frt/rpc/my_crypto_engine.hpp | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt index 2bacd37686a..6aa2e073e4e 100644 --- a/fnet/src/tests/frt/rpc/CMakeLists.txt +++ b/fnet/src/tests/frt/rpc/CMakeLists.txt @@ -8,6 +8,8 @@ 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_test(NAME fnet_invoke_test_app_tls_maybe_yes COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=tls_maybe_yes") +vespa_add_test(NAME fnet_invoke_test_app_tls_maybe_no COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=tls_maybe_no") vespa_add_executable(fnet_detach_return_invoke_test_app TEST SOURCES detach_return_invoke.cpp @@ -24,6 +26,8 @@ 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_test(NAME fnet_session_test_app_tls_maybe_yes COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls_maybe_yes") +vespa_add_test(NAME fnet_session_test_app_tls_maybe_no COMMAND fnet_session_test_app ENVIRONMENT "CRYPTOENGINE=tls_maybe_no") 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 6cd8d47e917..51811f4f70c 100644 --- a/fnet/src/tests/frt/rpc/my_crypto_engine.hpp +++ b/fnet/src/tests/frt/rpc/my_crypto_engine.hpp @@ -1,6 +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/crypto_engine.h> #include <vespa/vespalib/net/tls/tls_crypto_engine.h> +#include <vespa/vespalib/net/tls/maybe_tls_crypto_engine.h> #include <vespa/vespalib/test/make_tls_options_for_testing.h> vespalib::CryptoEngine::SP my_crypto_engine() { @@ -16,6 +18,14 @@ vespalib::CryptoEngine::SP my_crypto_engine() { } else if (engine == "tls") { fprintf(stderr, "crypto engine: tls\n"); return std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing()); + } else if (engine == "tls_maybe_yes") { + fprintf(stderr, "crypto engine: tls client, mixed server\n"); + auto tls = std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing()); + return std::make_shared<vespalib::MaybeTlsCryptoEngine>(std::move(tls), true); + } else if (engine == "tls_maybe_no") { + fprintf(stderr, "crypto engine: null client, mixed server\n"); + auto tls = std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing()); + return std::make_shared<vespalib::MaybeTlsCryptoEngine>(std::move(tls), false); } TEST_FATAL(("invalid crypto engine: " + engine).c_str()); abort(); |