From 288ecd11850b248d922a01eb4e929acc9294b433 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Mon, 18 Dec 2023 16:18:42 +0100 Subject: [PATCH 1/2] Fix build with TLS, but not security (#4156) Signed-off-by: Miguel Company (cherry picked from commit fae8f1e222410d637dc5ff585dfa425b495bba24) # Conflicts: # test/blackbox/common/BlackboxTestsSecurity.cpp --- test/blackbox/common/BlackboxTests.cpp | 1 + test/blackbox/common/BlackboxTests.hpp | 1 + test/blackbox/common/BlackboxTestsSecurity.cpp | 3 +++ 3 files changed, 5 insertions(+) diff --git a/test/blackbox/common/BlackboxTests.cpp b/test/blackbox/common/BlackboxTests.cpp index c852a08be98..e5fd17e82c0 100644 --- a/test/blackbox/common/BlackboxTests.cpp +++ b/test/blackbox/common/BlackboxTests.cpp @@ -30,6 +30,7 @@ using namespace eprosima::fastrtps::rtps; //#define cout "Use Log instead!" +const char* certs_path = nullptr; uint16_t global_port = 0; bool enable_datasharing; bool use_pull_mode; diff --git a/test/blackbox/common/BlackboxTests.hpp b/test/blackbox/common/BlackboxTests.hpp index 20ac338d00c..d56fd742302 100644 --- a/test/blackbox/common/BlackboxTests.hpp +++ b/test/blackbox/common/BlackboxTests.hpp @@ -49,6 +49,7 @@ extern void blackbox_security_init(); extern void tls_init(); #endif // if TLS_FOUND +extern const char* certs_path; extern uint16_t global_port; extern bool enable_datasharing; extern bool use_pull_mode; diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp index fc2f49bb650..8a8d620e54c 100644 --- a/test/blackbox/common/BlackboxTestsSecurity.cpp +++ b/test/blackbox/common/BlackboxTestsSecurity.cpp @@ -37,8 +37,11 @@ using namespace eprosima::fastrtps::rtps; using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; +<<<<<<< HEAD static const char* certs_path = nullptr; +======= +>>>>>>> fae8f1e22 (Fix build with TLS, but not security (#4156)) enum communication_type { TRANSPORT, From 958fe274a1a62e09b5776cf7cd40665eb96d3861 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 18 Dec 2023 16:31:38 +0100 Subject: [PATCH 2/2] Fix conflict Signed-off-by: JesusPoderoso --- test/blackbox/common/BlackboxTestsSecurity.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp index 8a8d620e54c..fc2f49bb650 100644 --- a/test/blackbox/common/BlackboxTestsSecurity.cpp +++ b/test/blackbox/common/BlackboxTestsSecurity.cpp @@ -37,11 +37,8 @@ using namespace eprosima::fastrtps::rtps; using test_UDPv4Transport = eprosima::fastdds::rtps::test_UDPv4Transport; using test_UDPv4TransportDescriptor = eprosima::fastdds::rtps::test_UDPv4TransportDescriptor; -<<<<<<< HEAD static const char* certs_path = nullptr; -======= ->>>>>>> fae8f1e22 (Fix build with TLS, but not security (#4156)) enum communication_type { TRANSPORT,