remove xor crypto engine from C++

4 files changed, 1 insertions, 19 deletions

diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
index c6008820bbc..624f5a73ae6 100644
--- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
@@ -137,7 +137,6 @@ void perform_test(size_t thread_id, Client &client, Result &result, bool vital =
 }
 
 CryptoEngine::SP null_crypto = std::make_shared<NullCryptoEngine>();
-CryptoEngine::SP xor_crypto = std::make_shared<XorCryptoEngine>();
 CryptoEngine::SP tls_crypto = std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing());
 namespace {
     uint32_t getNumThreads() {
@@ -148,9 +147,6 @@ namespace {
 TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads (no encryption)",
             getNumThreads(), Server(null_crypto, 1), Client(null_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); }
 
-TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads (xor encryption)",
-            getNumThreads(), Server(xor_crypto, 1), Client(xor_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); }
-
 TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads (tls encryption)",
             getNumThreads(), Server(tls_crypto, 1), Client(tls_crypto, 1, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); }
 
@@ -160,9 +156,6 @@ TEST_MT_FFF("parallel rpc with 1/1 transport threads and num_cores user threads
 TEST_MT_FFF("parallel rpc with 8/8 transport threads and num_cores user threads (no encryption)",
             getNumThreads(), Server(null_crypto, 8), Client(null_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3, true); }
 
-TEST_MT_FFF("parallel rpc with 8/8 transport threads and num_cores user threads (xor encryption)",
-            getNumThreads(), Server(xor_crypto, 8), Client(xor_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3); }
-
 TEST_MT_FFF("parallel rpc with 8/8 transport threads and num_cores user threads (tls encryption)",
             getNumThreads(), Server(tls_crypto, 8), Client(tls_crypto, 8, f1), Result(num_threads)) { perform_test(thread_id, f2, f3, true); }
 
diff --git a/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp b/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp
index 417dba8d803..d15fca93c0b 100644
--- a/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp
@@ -17,7 +17,6 @@ using namespace vespalib;
 using vespalib::test::TimeTracer;
 
 CryptoEngine::SP null_crypto = std::make_shared<NullCryptoEngine>();
-CryptoEngine::SP xor_crypto = std::make_shared<XorCryptoEngine>();
 CryptoEngine::SP tls_crypto = std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing());
 
 TT_Tag req_tag("request");
@@ -143,12 +142,6 @@ TEST_F("^^^-- rpc with null encryption", Fixture(null_crypto)) {
     benchmark_rpc(f1, true);
 }
 
-TEST_F("^^^-- rpc with xor encryption", Fixture(xor_crypto)) {
-    fprintf(stderr, "vvv-- rpc with xor encryption\n");
-    benchmark_rpc(f1, false);
-    benchmark_rpc(f1, true);
-}
-
 TEST_F("^^^-- rpc with tls encryption", Fixture(tls_crypto)) {
     fprintf(stderr, "vvv-- rpc with tls encryption\n");
     benchmark_rpc(f1, false);
diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt
index 35150cad7b6..baf70e3494d 100644
--- a/fnet/src/tests/frt/rpc/CMakeLists.txt
+++ b/fnet/src/tests/frt/rpc/CMakeLists.txt
@@ -6,7 +6,6 @@ vespa_add_executable(fnet_invoke_test_app TEST
     fnet
 )
 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")
diff --git a/fnet/src/tests/frt/rpc/my_crypto_engine.hpp b/fnet/src/tests/frt/rpc/my_crypto_engine.hpp
index 219b4dafd05..8ffe204fa28 100644
--- a/fnet/src/tests/frt/rpc/my_crypto_engine.hpp
+++ b/fnet/src/tests/frt/rpc/my_crypto_engine.hpp
@@ -12,10 +12,7 @@ vespalib::CryptoEngine::SP my_crypto_engine() {
         return std::make_shared<vespalib::NullCryptoEngine>();
     }
     std::string engine(env_str);
-    if (engine == "xor") {
-        fprintf(stderr, "crypto engine: xor\n");
-        return std::make_shared<vespalib::XorCryptoEngine>();
-    } else if (engine == "tls") {
+    if (engine == "tls") {
         fprintf(stderr, "crypto engine: tls\n");
         return std::make_shared<vespalib::TlsCryptoEngine>(
                 vespalib::test::make_telemetry_only_capability_tls_options_for_testing());